Merge pull request #23 from tribal-tec/qt5

Port to Qt5

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 2b5e50e
+# CMake/common https://github.com/Eyescale/CMake.git 4f3ae43

.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
@@ -61,4 +60,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/CPackConfig.cmake

@@ -10,9 +10,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6,
                                   libboost-program_options,
                                   libboost-date-time,
                                   libboost-thread,
-                                  libqt4-core,
-                                  libqt4-gui,
-                                  libqt4-opengl,
+                                  qtbase5-dev,
                                   equalizer,
                                   tuvok")
 

CMake/FindPackages.cmake

@@ -68,7 +68,9 @@ common_package(Equalizer 1.8  REQUIRED )
 common_package(Lunchbox 1.10  REQUIRED )
 common_package(OpenGL   REQUIRED )
 common_package(PNG   REQUIRED )
-common_package(Qt4 4.8  REQUIRED COMPONENTS QtCore QtGui QtOpenGL)
+common_package(Qt5Core   REQUIRED )
+common_package(Qt5OpenGL   REQUIRED )
+common_package(Qt5Widgets   REQUIRED )
 common_package(Threads   REQUIRED )
 
 if(EXISTS ${PROJECT_SOURCE_DIR}/CMake/FindPackagesPost.cmake)
@@ -427,25 +429,69 @@ if(PNG_name)
   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 LIVRE_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 LIVRE_USE_QT5CORE)
+  if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
+    list(APPEND LIVRE_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 LIVRE_USE_QT5OPENGL)
+  if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
+    list(APPEND LIVRE_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 LIVRE_USE_QT5WIDGETS)
   if(NOT COMMON_LIBRARY_TYPE MATCHES "SHARED")
-    list(APPEND LIVRE_DEPENDENT_LIBRARIES Qt4)
+    list(APPEND LIVRE_DEPENDENT_LIBRARIES Qt5Widgets)
   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})
+  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()
-  if(NOT "${${Qt4_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
-    include_directories(SYSTEM ${${Qt4_name}_INCLUDE_DIR})
+  if(NOT "${${Qt5Widgets_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+    include_directories(${${Qt5Widgets_name}_INCLUDE_DIR})
   endif()
 endif()
 
@@ -471,9 +517,9 @@ if(Threads_name)
   endif()
 endif()
 
-set(LIVRE_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;libzmq3-dev;openmpi-bin;pkg-config;subversion)
+set(LIVRE_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;libzmq3-dev;openmpi-bin;pkg-config;qtbase5-dev;subversion)
 
-set(LIVRE_DEPENDS BBPTestData;OpenMP;Tuvok;VTune;GLEW_MX;zeq;FlatBuffers;RESTConnector;LibJpegTurbo;Boost;Collage;dash;Equalizer;Lunchbox;OpenGL;PNG;Qt4;Threads)
+set(LIVRE_DEPENDS BBPTestData;OpenMP;Tuvok;VTune;GLEW_MX;zeq;FlatBuffers;RESTConnector;LibJpegTurbo;Boost;Collage;dash;Equalizer;Lunchbox;OpenGL;PNG;Qt5Core;Qt5OpenGL;Qt5Widgets;Threads)
 
 # Write defines.h and options.cmake
 if(NOT PROJECT_INCLUDE_NAME)

CMake/FindRequired.cmake

@@ -79,9 +79,17 @@ common_package(PNG   QUIET)
 if(NOT PNG_FOUND AND NOT PNG_FOUND)
   set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} PNG")
 endif()
-common_package(Qt4 4.8 COMPONENTS QtCore QtGui QtOpenGL QUIET)
-if(NOT Qt4_FOUND AND NOT QT4_FOUND)
-  set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} Qt4")
+common_package(Qt5Core   QUIET)
+if(NOT Qt5Core_FOUND AND NOT QT5CORE_FOUND)
+  set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} Qt5Core")
+endif()
+common_package(Qt5OpenGL   QUIET)
+if(NOT Qt5OpenGL_FOUND AND NOT QT5OPENGL_FOUND)
+  set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} Qt5OpenGL")
+endif()
+common_package(Qt5Widgets   QUIET)
+if(NOT Qt5Widgets_FOUND AND NOT QT5WIDGETS_FOUND)
+  set(FIND_REQUIRED_FAILED "${FIND_REQUIRED_FAILED} Qt5Widgets")
 endif()
 common_package(Threads   QUIET)
 if(NOT Threads_FOUND AND NOT THREADS_FOUND)

CMake/Livre.cmake

@@ -6,10 +6,10 @@ set(LIVRE_PACKAGE_VERSION 0.2.0)
 set(LIVRE_REPO_URL https://github.com/BlueBrain/Livre)
 set(LIVRE_DEPENDS BBPTestData OpenMP Tuvok VTune GLEW_MX zeq FlatBuffers
   RESTConnector LibJpegTurbo
-  REQUIRED Boost Collage dash Equalizer Lunchbox OpenGL PNG Qt4 Threads)
+  REQUIRED Boost Collage dash Equalizer Lunchbox OpenGL PNG Qt5Core Qt5OpenGL
+           Qt5Widgets Threads)
 set(LIVRE_BOOST_COMPONENTS
   "filesystem program_options thread system regex unit_test_framework")
-set(LIVRE_QT4_COMPONENTS "QtCore QtGui QtOpenGL")
 set(LIVRE_SUBPROJECT ON)
 
 if(CI_BUILD_COMMIT)

apps/livreGUI/CMakeLists.txt

@@ -48,8 +48,7 @@ list(APPEND CPPCHECK_EXTRA_ARGS
   --suppress=*:${CMAKE_CURRENT_BINARY_DIR}/Editor/moc_TransferFunctionEditor.cxx
   --suppress=*:${CMAKE_CURRENT_BINARY_DIR}/moc_MainWindow.cxx)
 
-include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS} "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED" )
-set(LIVREGUI_LINK_LIBRARIES LivreCore LivreEq ${QT_LIBRARIES})
+set(LIVREGUI_LINK_LIBRARIES LivreCore LivreEq ${Qt5Widgets_LIBRARIES})
 
 common_application(livreGUI MACOSX_BUNDLE)

apps/livreGUI/LivreGUI.cpp

@@ -22,7 +22,7 @@
 #include <livreGUI/AppSettings.h>
 #include <livreGUI/Editor/TransferFunctionEditor.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDesktopWidget>
 #include <QMainWindow>
 

livre/Eq/CMakeLists.txt

@@ -17,8 +17,9 @@ stringify_shaders(${LIVREEQ_SHADERS})
 list(APPEND LIVREEQ_SOURCES ${SHADER_SOURCES})
 include_directories(${PROJECT_BINARY_DIR})
 
-set(LIVREEQ_LINK_LIBRARIES LivreLib ${EQUALIZER_LIBRARY} ${EQUALIZERFABRIC_LIBRARY} ${QT_LIBRARIES}
-  ${ZEQ_LIBRARIES} ${LibJpegTurbo_LIBRARIES} ${RESTCONNECTOR_LIBRARIES})
+set(LIVREEQ_LINK_LIBRARIES LivreLib ${EQUALIZER_LIBRARY}
+  ${EQUALIZERFABRIC_LIBRARY} ${ZEQ_LIBRARIES} ${LibJpegTurbo_LIBRARIES}
+  ${RESTCONNECTOR_LIBRARIES})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
 set(PROJECT_INCLUDE_NAME livre/Eq)