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

src/osgQt/CMakeLists.txt

@@ -12,7 +12,11 @@ SET(SOURCES_H
     ${HEADER_PATH}/QGraphicsViewAdapter
 )
 
-QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" )
+IF ( Qt5Widgets_FOUND )
+    QT5_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" )
+ELSE()
+    QT4_WRAP_CPP( SOURCES_H_MOC ${SOURCES_H} OPTIONS "-f" )
+ENDIF()
 
 SET(TARGET_H
     ${HEADER_PATH}/Export
@@ -47,20 +51,27 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
    STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 ENDIF()
 
-SET(TARGET_LIBRARIES
-    ${TARGET_LIBRARIES}
-    ${QT_QTCORE_LIBRARY} 
-    ${QT_QTGUI_LIBRARY}
-    ${QT_QTOPENGL_LIBRARY}
-)
-
 # FIXME: This should work but something with the LINK_WITH_VARIABLES macro is not working
 #SET(TARGET_LIBRARIES_VARS
 #    QT_QTCORE_LIBRARY 
 #    QT_QTGUI_LIBRARY
 #    QT_QTOPENGL_LIBRARY
 #)
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
+
+IF( QT4_FOUND )
+    INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+             ${QT_QTOPENGL_INCLUDE_DIR} )
+    SET(TARGET_LIBRARIES
+    ${TARGET_LIBRARIES}
+    ${QT_QTCORE_LIBRARY} 
+    ${QT_QTGUI_LIBRARY}
+    ${QT_QTOPENGL_LIBRARY}
+)
+
+ENDIF( QT4_FOUND )
 
 SETUP_LIBRARY(${LIB_NAME})
 
+IF ( Qt5Widgets_FOUND )
+    qt5_use_modules( ${LIB_NAME} Widgets OpenGL )
+ENDIF ( Qt5Widgets_FOUND )

src/osgQt/GraphicsWindowQt.cpp

@@ -14,7 +14,7 @@
 #include <osg/DeleteHandler>
 #include <osgQt/GraphicsWindowQt>
 #include <osgViewer/ViewerBase>
-#include <QtGui/QInputEvent>
+#include <QInputEvent>
 
 using namespace osgQt;
 
@@ -96,7 +96,7 @@ public:
         KeyMap::iterator itr = mKeyMap.find(event->key());
         if (itr == mKeyMap.end())
         {
-            return int(*(event->text().toAscii().data()));
+            return int(*(event->text().toLatin1().data()));
         }
         else
             return itr->second;

src/osgQt/QFontImplementation.cpp

@@ -16,10 +16,10 @@
 #include <osgDB/Registry>
 #include <osgText/Font>
 
-#include <QtGui/QFont>
-#include <QtGui/QFontMetrics>
-#include <QtGui/QImage>
-#include <QtGui/QPainter>
+#include <QFont>
+#include <QFontMetrics>
+#include <QImage>
+#include <QPainter>
 
 namespace osgQt {
 

src/osgQt/QGraphicsViewAdapter.cpp

@@ -21,8 +21,8 @@
 
 #include <osg/NodeVisitor>
 #include <osg/io_utils>
-#include <QtGui/QGraphicsItem>
-#include <QtGui/QGraphicsProxyWidget>
+#include <QGraphicsItem>
+#include <QGraphicsProxyWidget>
 
 #define MYQKEYEVENT 2000
 #define MYQPOINTEREVENT 2001

src/osgQt/QWidgetImage.cpp

@@ -12,7 +12,7 @@
 */
 
 #include <osgQt/QWidgetImage>
-#include <QtGui/QLayout>
+#include <QLayout>
 
 namespace osgQt
 {