Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -328,6 +328,11 @@ IF(WITH_QT5)
       ENDIF()
 
       # freetype is needed since Qt 5.5
+      FIND_PACKAGE(FreeType)
+
+      IF(FREETYPE_FOUND)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIBRARIES})
+      ELSE()
         IF(UNIX)
           SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
         ELSEIF(WIN32)
@@ -336,6 +341,7 @@ IF(WITH_QT5)
         IF(EXISTS ${FREETYPE_LIB})
           SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB})
         ENDIF()
+      ENDIF()
 
       ADD_QT_PLUGIN(accessible qtaccessiblewidgets)