From Kristofer Tingdahl, with additions from Riccardo Corsi and Robert Milharcic, support for Qt5 build

examples/osgviewerQt/CMakeLists.txt

@@ -2,15 +2,26 @@ SET( TARGET_SRC
     osgviewerQt.cpp
 )
 
-IF( QT4_FOUND )
-    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE} ${QT_QTOPENGL_LIBRARY_RELEASE} )
+IF ( NOT Qt5Widgets_FOUND )
+    IF( QT4_FOUND )
+    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY_RELEASE} ${QT_QTGUI_LIBRARY_RELEASE}
+        ${QT_QTOPENGL_LIBRARY_RELEASE} )
     ADD_DEFINITIONS(-DUSE_QT4)
-ELSE( QT4_FOUND )
+    ELSE( QT4_FOUND )
     SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
-ENDIF( QT4_FOUND )
+    ENDIF( QT4_FOUND )
 
-INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
+    INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+             ${QT_QTOPENGL_INCLUDE_DIR} )
+ENDIF()
 
 SET(TARGET_ADDED_LIBRARIES osgWidget osgQt)
 
-SETUP_EXAMPLE( osgviewerQt )
+SET( EXAMPLE_NAME osgviewerQt )
+
+SETUP_EXAMPLE( ${EXAMPLE_NAME} )
+
+IF ( Qt5Widgets_FOUND )
+    qt5_use_modules( example_${EXAMPLE_NAME} Widgets OpenGL )
+ENDIF( Qt5Widgets_FOUND )
+

examples/osgviewerQt/osgviewerQt.cpp

@@ -1,6 +1,6 @@
-#include <QtCore/QTimer>
-#include <QtGui/QApplication>
-#include <QtGui/QGridLayout>
+#include <QTimer>
+#include <QApplication>
+#include <QGridLayout>
 
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
@@ -19,6 +19,9 @@ public:
     ViewerWidget(osgViewer::ViewerBase::ThreadingModel threadingModel=osgViewer::CompositeViewer::SingleThreaded) : QWidget()
     {
         setThreadingModel(threadingModel);
+        
+        // disable the default setting of viewer.done() by pressing Escape.
+        setKeyEventSetsDone(0);
 
         QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osgt") );
         QWidget* widget2 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("glider.osgt") );