Fixed: Compilation under Linux with Qt 5.10

--HG--
branch : develop

code/CMakeLists.txt

@@ -312,12 +312,19 @@ IF(WITH_QT5)
         ADD_QT_PLUGIN(xcbglintegrations qxcb-glx-integration)
 
         ADD_QT_LIBRARY(XcbQpa)
+        ADD_QT_LIBRARY(GlxSupport)
+        ADD_QT_LIBRARY(ServiceSupport)
+        ADD_QT_LIBRARY(EdidSupport)
+        ADD_QT_LIBRARY(FontDatabaseSupport)
+        ADD_QT_LIBRARY(ThemeSupport)
+        ADD_QT_LIBRARY(EventDispatcherSupport)
         ADD_QT_LIBRARY(PlatformSupport)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL -lxcb-glx)
+
+        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lSM -lICE -lxcb -lGL -lxcb-glx)
         IF(EXISTS "${QT_LIBRARY_DIR}/libxcb-static.a")
           SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a")
         ENDIF()
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lfontconfig)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} -lfontconfig -lX11 -lXrender)
         ADD_QT_LIBRARY(DBus)
       ENDIF()
 
@@ -329,6 +336,9 @@ IF(WITH_QT5)
       # harfbuzz is needed since Qt 5.3
       IF(UNIX)
         SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzzng.a")
+        IF(NOT EXISTS ${HB_LIB})
+          SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzz.a")
+        ENDIF()
       ELSEIF(WIN32)
         SET(HB_LIB "${QT_LIBRARY_DIR}/qtharfbuzzng.lib")
       ENDIF()
@@ -373,6 +383,9 @@ IF(WITH_QT5)
       # pcre is needed since Qt 5.5
       IF(UNIX)
         SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre.a")
+        IF(NOT EXISTS ${PCRE_LIB})
+          SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre2.a")
+        ENDIF()
       ELSEIF(WIN32)
         SET(PCRE_LIB "${QT_LIBRARY_DIR}/qtpcre.lib")
       ENDIF()
@@ -391,7 +404,7 @@ IF(WITH_QT5)
           ${CARBON_FRAMEWORK}
           ${SECURITY_FRAMEWORK})
       ELSEIF(UNIX)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
       ENDIF()
     ELSE()
       SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)