Port to Qt5

.travis.yml

@@ -51,7 +51,6 @@ before_install:
  - sudo apt-get install -qq libopencv-dev || /bin/true
  - sudo apt-get install -qq libopenmpi-dev || /bin/true
  - sudo apt-get install -qq libopenscenegraph-dev || /bin/true
- - sudo apt-get install -qq libqt4-dev || /bin/true
  - sudo apt-get install -qq librdmacm-dev || /bin/true
  - sudo apt-get install -qq libspnav-dev || /bin/true
  - sudo apt-get install -qq libturbojpeg || /bin/true
@@ -60,4 +59,5 @@ before_install:
  - sudo apt-get install -qq ninja-build || /bin/true
  - sudo apt-get install -qq openmpi-bin || /bin/true
  - sudo apt-get install -qq pkg-config || /bin/true
+ - sudo apt-get install -qq qtbase5-dev || /bin/true
  - sudo apt-get install -qq subversion || /bin/true

CMake/Equalizer.cmake

@@ -1,24 +1,22 @@
 
 
 set(EQUALIZER_PACKAGE_VERSION 1.8)
+set(EQUALIZER_REPO_URL https://github.com/Eyescale/Equalizer.git)
+
 set(EQUALIZER_DEPENDS
   REQUIRED vmmlib Lunchbox Collage OpenGL Boost Pression
   OPTIONAL X11 hwsd GLStats hwloc OpenSceneGraph OpenCV VRPN
-           Deflect MAGELLAN GLEW_MX Qt4)
+           Deflect MAGELLAN GLEW_MX Qt5Core Qt5OpenGL Qt5Widgets)
+set(EQUALIZER_BOOST_COMPONENTS "program_options filesystem system thread")
+set(EQUALIZER_OPENSCENEGRAPH_COMPONENTS "osgDB osgUtil")
+
 set(EQUALIZER_DEB_DEPENDS bison flex libboost-program-options-dev
   libboost-filesystem-dev libboost-system-dev libboost-thread-dev
   libx11-dev libgl1-mesa-dev libglewmx1.6-dev libspnav-dev
-  libopenscenegraph-dev libopencv-dev libqt4-dev)
+  libopenscenegraph-dev libopencv-dev qtbase5-dev)
 set(EQUALIZER_PORT_DEPENDS boost opencv)
-
-set(EQUALIZER_BOOST_COMPONENTS "program_options filesystem system thread")
-set(EQUALIZER_OPENSCENEGRAPH_COMPONENTS "osgDB osgUtil")
-set(EQUALIZER_QT4_COMPONENTS "QtCore QtGui QtOpenGL")
-
 set(EQUALIZER_ROOT_VAR EQ_ROOT)
-set(EQUALIZER_REPO_URL https://github.com/Eyescale/Equalizer.git)
-set(EQUALIZER_REPO_TAG master)
-set(EQUALIZER_FORCE_BUILD ${CI_BUILD})
+set(EQUALIZER_SUBPROJECT ON)
 
 if(CI_BUILD_COMMIT)
   set(EQUALIZER_REPO_TAG ${CI_BUILD_COMMIT})

CMake/FindPackages.cmake

@@ -68,7 +68,9 @@ common_package(VRPN 07.30   )
 common_package(Deflect 0.4   )
 common_package(MAGELLAN    )
 common_package(GLEW_MX    )
-common_package(Qt4 4.8   COMPONENTS QtCore QtGui QtOpenGL)
+common_package(Qt5Core    )
+common_package(Qt5OpenGL    )
+common_package(Qt5Widgets    )
 
 if(EXISTS ${PROJECT_SOURCE_DIR}/CMake/FindPackagesPost.cmake)
   include(${PROJECT_SOURCE_DIR}/CMake/FindPackagesPost.cmake)
@@ -91,6 +93,9 @@ if(vmmlib_name)
   if(NOT "${${vmmlib_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${vmmlib_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${vmmlib_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${vmmlib_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(LUNCHBOX_FOUND)
@@ -110,6 +115,9 @@ if(Lunchbox_name)
   if(NOT "${${Lunchbox_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${Lunchbox_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${Lunchbox_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Lunchbox_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(COLLAGE_FOUND)
@@ -129,6 +137,9 @@ if(Collage_name)
   if(NOT "${${Collage_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${Collage_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${Collage_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Collage_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(OPENGL_FOUND)
@@ -148,6 +159,9 @@ if(OpenGL_name)
   if(NOT "${${OpenGL_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${OpenGL_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${OpenGL_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${OpenGL_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(BOOST_FOUND)
@@ -167,6 +181,9 @@ if(Boost_name)
   if(NOT "${${Boost_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(SYSTEM ${${Boost_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${Boost_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(SYSTEM ${${Boost_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(PRESSION_FOUND)
@@ -186,6 +203,9 @@ if(Pression_name)
   if(NOT "${${Pression_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${Pression_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${Pression_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Pression_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(X11_FOUND)
@@ -205,6 +225,9 @@ if(X11_name)
   if(NOT "${${X11_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${X11_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${X11_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${X11_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(HWSD_FOUND)
@@ -224,6 +247,9 @@ if(hwsd_name)
   if(NOT "${${hwsd_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${hwsd_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${hwsd_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${hwsd_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(GLSTATS_FOUND)
@@ -243,6 +269,9 @@ if(GLStats_name)
   if(NOT "${${GLStats_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${GLStats_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${GLStats_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${GLStats_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(HWLOC_FOUND)
@@ -262,6 +291,9 @@ if(hwloc_name)
   if(NOT "${${hwloc_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${hwloc_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${hwloc_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${hwloc_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(OPENSCENEGRAPH_FOUND)
@@ -281,6 +313,9 @@ if(OpenSceneGraph_name)
   if(NOT "${${OpenSceneGraph_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(BEFORE SYSTEM ${${OpenSceneGraph_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${OpenSceneGraph_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(BEFORE SYSTEM ${${OpenSceneGraph_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(OPENCV_FOUND)
@@ -300,6 +335,9 @@ if(OpenCV_name)
   if(NOT "${${OpenCV_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(SYSTEM ${${OpenCV_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${OpenCV_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(SYSTEM ${${OpenCV_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(VRPN_FOUND)
@@ -319,6 +357,9 @@ if(VRPN_name)
   if(NOT "${${VRPN_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(SYSTEM ${${VRPN_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${VRPN_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(SYSTEM ${${VRPN_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(DEFLECT_FOUND)
@@ -338,6 +379,9 @@ if(Deflect_name)
   if(NOT "${${Deflect_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${Deflect_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${Deflect_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Deflect_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(MAGELLAN_FOUND)
@@ -357,6 +401,9 @@ if(MAGELLAN_name)
   if(NOT "${${MAGELLAN_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${MAGELLAN_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${MAGELLAN_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${MAGELLAN_name}_INCLUDE_DIR})
+  endif()
 endif()
 
 if(GLEW_MX_FOUND)
@@ -376,30 +423,80 @@ if(GLEW_MX_name)
   if(NOT "${${GLEW_MX_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
     include_directories(${${GLEW_MX_name}_INCLUDE_DIRS})
   endif()
+  if(NOT "${${GLEW_MX_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${GLEW_MX_name}_INCLUDE_DIR})
+  endif()
 endif()
 
-if(QT4_FOUND)
-  set(Qt4_name QT4)
-  set(Qt4_FOUND TRUE)
-elseif(Qt4_FOUND)
-  set(Qt4_name Qt4)
-  set(QT4_FOUND TRUE)
-endif()
-if(Qt4_name)
-  list(APPEND FIND_PACKAGES_DEFINES EQUALIZER_USE_QT4)
+if(QT5CORE_FOUND)
+  set(Qt5Core_name QT5CORE)
+  set(Qt5Core_FOUND TRUE)
+elseif(Qt5Core_FOUND)
+  set(Qt5Core_name Qt5Core)
+  set(QT5CORE_FOUND TRUE)
+endif()
+if(Qt5Core_name)
+  list(APPEND FIND_PACKAGES_DEFINES EQUALIZER_USE_QT5CORE)
+  if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
+    list(APPEND EQUALIZER_DEPENDENT_LIBRARIES Qt5Core)
+  endif()
+  set(FIND_PACKAGES_FOUND "${FIND_PACKAGES_FOUND} Qt5Core")
+  link_directories(${${Qt5Core_name}_LIBRARY_DIRS})
+  if(NOT "${${Qt5Core_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
+    include_directories(BEFORE SYSTEM ${${Qt5Core_name}_INCLUDE_DIRS})
+  endif()
+  if(NOT "${${Qt5Core_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(BEFORE SYSTEM ${${Qt5Core_name}_INCLUDE_DIR})
+  endif()
+endif()
+
+if(QT5OPENGL_FOUND)
+  set(Qt5OpenGL_name QT5OPENGL)
+  set(Qt5OpenGL_FOUND TRUE)
+elseif(Qt5OpenGL_FOUND)
+  set(Qt5OpenGL_name Qt5OpenGL)
+  set(QT5OPENGL_FOUND TRUE)
+endif()
+if(Qt5OpenGL_name)
+  list(APPEND FIND_PACKAGES_DEFINES EQUALIZER_USE_QT5OPENGL)
   if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
-    list(APPEND EQUALIZER_DEPENDENT_LIBRARIES Qt4)
+    list(APPEND EQUALIZER_DEPENDENT_LIBRARIES Qt5OpenGL)
+  endif()
+  set(FIND_PACKAGES_FOUND "${FIND_PACKAGES_FOUND} Qt5OpenGL")
+  link_directories(${${Qt5OpenGL_name}_LIBRARY_DIRS})
+  if(NOT "${${Qt5OpenGL_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
+    include_directories(${${Qt5OpenGL_name}_INCLUDE_DIRS})
+  endif()
+  if(NOT "${${Qt5OpenGL_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Qt5OpenGL_name}_INCLUDE_DIR})
+  endif()
+endif()
+
+if(QT5WIDGETS_FOUND)
+  set(Qt5Widgets_name QT5WIDGETS)
+  set(Qt5Widgets_FOUND TRUE)
+elseif(Qt5Widgets_FOUND)
+  set(Qt5Widgets_name Qt5Widgets)
+  set(QT5WIDGETS_FOUND TRUE)
+endif()
+if(Qt5Widgets_name)
+  list(APPEND FIND_PACKAGES_DEFINES EQUALIZER_USE_QT5WIDGETS)
+  if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
+    list(APPEND EQUALIZER_DEPENDENT_LIBRARIES Qt5Widgets)
+  endif()
+  set(FIND_PACKAGES_FOUND "${FIND_PACKAGES_FOUND} Qt5Widgets")
+  link_directories(${${Qt5Widgets_name}_LIBRARY_DIRS})
+  if(NOT "${${Qt5Widgets_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
+    include_directories(${${Qt5Widgets_name}_INCLUDE_DIRS})
   endif()
-  set(FIND_PACKAGES_FOUND "${FIND_PACKAGES_FOUND} Qt4")
-  link_directories(${${Qt4_name}_LIBRARY_DIRS})
-  if(NOT "${${Qt4_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
-    include_directories(SYSTEM ${${Qt4_name}_INCLUDE_DIRS})
+  if(NOT "${${Qt5Widgets_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Qt5Widgets_name}_INCLUDE_DIR})
   endif()
 endif()
 
-set(EQUALIZER_BUILD_DEBS autoconf;automake;avahi-daemon;bison;cmake;doxygen;flex;freeglut3-dev;git;git-review;libavahi-client-dev;libboost-date-time-dev;libboost-filesystem-dev;libboost-program-options-dev;libboost-regex-dev;libboost-serialization-dev;libboost-system-dev;libboost-test-dev;libboost-thread-dev;libgl1-mesa-dev;libglewmx1.6-dev;libhwloc-dev;libibverbs-dev;libjpeg-turbo8-dev;libleveldb-dev;libopencv-dev;libopenmpi-dev;libopenscenegraph-dev;libqt4-dev;librdmacm-dev;libspnav-dev;libturbojpeg;libudt-dev;libx11-dev;openmpi-bin;pkg-config;subversion)
+set(EQUALIZER_BUILD_DEBS autoconf;automake;avahi-daemon;bison;cmake;doxygen;flex;freeglut3-dev;git;git-review;libavahi-client-dev;libboost-date-time-dev;libboost-filesystem-dev;libboost-program-options-dev;libboost-regex-dev;libboost-serialization-dev;libboost-system-dev;libboost-test-dev;libboost-thread-dev;libgl1-mesa-dev;libglewmx1.6-dev;libhwloc-dev;libibverbs-dev;libjpeg-turbo8-dev;libleveldb-dev;libopencv-dev;libopenmpi-dev;libopenscenegraph-dev;librdmacm-dev;libspnav-dev;libturbojpeg;libudt-dev;libx11-dev;openmpi-bin;pkg-config;qtbase5-dev;subversion)
 
-set(EQUALIZER_DEPENDS vmmlib;Lunchbox;Collage;OpenGL;Boost;Pression;X11;hwsd;GLStats;hwloc;OpenSceneGraph;OpenCV;VRPN;Deflect;MAGELLAN;GLEW_MX;Qt4)
+set(EQUALIZER_DEPENDS vmmlib;Lunchbox;Collage;OpenGL;Boost;Pression;X11;hwsd;GLStats;hwloc;OpenSceneGraph;OpenCV;VRPN;Deflect;MAGELLAN;GLEW_MX;Qt5Core;Qt5OpenGL;Qt5Widgets)
 
 # Write defines.h and options.cmake
 if(NOT PROJECT_INCLUDE_NAME)

eq/client/CMakeLists.txt

@@ -65,7 +65,7 @@ if(EQ_GLX_USED)
   list(APPEND EQ_LIBRARIES ${X11_LIBRARIES})
 endif()
 if(EQ_QT_USED)
-  list(APPEND EQ_LIBRARIES ${QT_LIBRARIES})
+  list(APPEND EQ_LIBRARIES ${Qt5OpenGL_LIBRARIES} ${Qt5Widgets_LIBRARIES})
 endif()
 
 source_group(fabric REGULAR_EXPRESSION .*)

eq/client/files.cmake

@@ -217,7 +217,7 @@ if(EQ_GLX_USED)
   list(APPEND CLIENT_SOURCES ${GLX_SOURCES})
 endif()
 if(EQ_QT_USED)
-  qt4_wrap_cpp(QT_MOC_OUTFILES ${QT_MOC_HEADERS})
+  qt5_wrap_cpp(QT_MOC_OUTFILES ${QT_MOC_HEADERS})
   list(APPEND CLIENT_SOURCES ${QT_SOURCES} ${QT_MOC_OUTFILES})
 endif()
 if(WIN32)

eq/client/glx/window.cpp

@@ -28,7 +28,7 @@
 
 #include <co/objectOCommand.h>
 
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
 #  include "../qt/window.h"
 #endif
 
@@ -346,7 +346,7 @@ GLXContext Window::createGLXContext( GLXFBConfig* fbConfig )
                                  dynamic_cast< const WindowIF* >( shareWindow );
         if( shareGLXWindow )
             shCtx = shareGLXWindow->getGLXContext();
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
         else if( dynamic_cast< const qt::WindowIF* >( shareWindow ))
         {
             // allows sharing with Qt window

eq/client/init.cpp

@@ -19,7 +19,7 @@
 
 #include "init.h"
 
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
 #  include <QApplication>
 #  include "qt/windowSystem.h"
 #endif
@@ -121,7 +121,7 @@ bool _init( const int argc, char** argv, NodeFactory* nodeFactory )
     ::XInitThreads();
 #endif
 
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
     if( QApplication::instance( ))
         _windowSystems.push_back( new qt::WindowSystem );
 #endif

examples/eVolve/localInitData.cpp

@@ -73,7 +73,7 @@ void LocalInitData::parseArguments( const int argc, char** argv )
 #ifdef WGL
     wsHelp += "WGL ";
 #endif
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
     wsHelp += "Qt ";
 #endif
     wsHelp += ")";

examples/eqPly/localInitData.cpp

@@ -87,7 +87,7 @@ void LocalInitData::parseArguments( const int argc, char** argv )
 #ifdef WGL
     wsHelp += "WGL ";
 #endif
-#ifdef EQUALIZER_USE_QT4
+#ifdef EQUALIZER_USE_QT5WIDGETS
     wsHelp += "Qt ";
 #endif
     wsHelp += ")";