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

examples/osgQtBrowser/CMakeLists.txt

@@ -7,10 +7,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
    STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 ENDIF()
 
-SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
+if ( QT4_FOUND )
+    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
+    INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} )
+endif( QT4_FOUND )
 
 SET(TARGET_ADDED_LIBRARIES osgWidget osgQt)
 
 #### end var setup  ###
-SETUP_EXAMPLE(osgQtBrowser)
+SET ( EXAMPLE_NAME osgQtBrowser )
+SETUP_EXAMPLE(${EXAMPLE_NAME})
+
+IF ( Qt5Widgets_FOUND )
+    qt5_use_modules( example_${EXAMPLE_NAME} Widgets OpenGL WebKitWidgets )
+ENDIF( Qt5Widgets_FOUND )
+
+

examples/osgQtBrowser/osgQtBrowser.cpp

@@ -29,14 +29,20 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osgWidget/Browser>
 
+#include <QtGlobal>
+#if QT_VERSION >= 0x050000
+# include <QtWebKitWidgets>
+#else
+# include <QtWebKit>
+#endif
 
-#include <QtWebKit/QWebSettings>
-#include <QtWebKit/QtWebKit>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QtEvents>
+#include <QWebSettings>
+
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QApplication>
+#include <QPainter>
+#include <QtEvents>
 
 #include <osgQt/QGraphicsViewAdapter>
 #include <osgQt/QWebViewImage>