Skip to content

Compatible with the new and old versions of OSG #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2018
Merged

Compatible with the new and old versions of OSG #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9a41d
Compatible with the new and old versions of OSG
airscrat Apr 19, 2018
e2a349f
Compatible with the new and old versions of OSG. osg3.4&3.6 passed th…
airscrat Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ENDIF()

PROJECT(osgQt)

FIND_PACKAGE(OpenSceneGraph 3.5.6 REQUIRED osgDB osgGA osgUtil osgText osgViewer osgWidget)
FIND_PACKAGE(OpenSceneGraph 3.0.0 REQUIRED osgDB osgGA osgUtil osgText osgViewer osgWidget)
SET(OPENSCENEGRAPH_SOVERSION 145)

SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
Expand Down
3 changes: 2 additions & 1 deletion include/osgQt/GraphicsWindowQt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <QQueue>
#include <QSet>
#include <QGLWidget>
#include <osg/Version>

class QInputEvent;
class QGestureEvent;
Expand All @@ -36,7 +37,7 @@ namespace osgQt
// forward declarations
class GraphicsWindowQt;

#if 0
#if OSG_VERSION_LESS_THAN(3, 5, 6)
/// The function sets the WindowingSystem to Qt.
void OSGQT_EXPORT initQtWindowingSystem();
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/osgQt/GraphicsWindowQt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ class QtWindowingSystem : public osg::GraphicsContext::WindowingSystemInterface
QtWindowingSystem& operator=( const QtWindowingSystem& );
};

#if 1
#if OSG_VERSION_GREATER_OR_EQUAL(3, 5, 6)
REGISTER_WINDOWINGSYSTEMINTERFACE(Qt, QtWindowingSystem)
#else

Expand Down