Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -263,8 +263,10 @@ IF(WITH_QT5)
 
         ADD_QT_LIBRARY(XcbQpa)
         ADD_QT_LIBRARY(PlatformSupport)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL)
+        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)
         ADD_QT_LIBRARY(DBus)
       ENDIF()
@@ -336,7 +338,7 @@ IF(WITH_QT5)
           ${CARBON_FRAMEWORK}
           ${SECURITY_FRAMEWORK})
       ELSEIF(UNIX)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
       ENDIF()
     ELSE()
       SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)

code/CMakeModules/PCHSupport.cmake

@@ -40,14 +40,14 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
 
   GET_TARGET_PROPERTY(_targetType ${_target} TYPE)
 
-  SET(_USE_PIE OFF)
+  SET(_USE_PIC OFF)
 
   IF(${_targetType} STREQUAL "SHARED_LIBRARY" OR ${_targetType} STREQUAL "MODULE_LIBRARY")
     LIST(APPEND _FLAGS " ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
   ELSE()
     GET_TARGET_PROPERTY(_pic ${_target} POSITION_INDEPENDENT_CODE)
     IF(_pic)
-      SET(_USE_PIE ON)
+      SET(_USE_PIC ON)
     ENDIF()
   ENDIF()
 
@@ -152,13 +152,12 @@ MACRO(PCH_SET_COMPILE_FLAGS _target)
       LIST(APPEND GLOBAL_DEFINITIONS " -DQT_NO_DEBUG")
     ENDIF()
 
-    # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIE
+    # Qt5_POSITION_INDEPENDENT_CODE should be true if Qt was compiled with PIC
     IF(Qt5_POSITION_INDEPENDENT_CODE)
-      SET(_USE_PIE ON)
+      SET(_USE_PIC ON)
     ENDIF()
 
-    IF(_USE_PIE)
-      LIST(APPEND _FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_PIE}")
+    IF(_USE_PIC)
       LIST(APPEND _FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_PIC}")
     ENDIF()
   ENDIF()