Merge with develop

This commit is contained in:
kervala 2016-02-04 15:25:39 +01:00
parent cb4c93648e
commit eef399dcc7

View file

@ -269,10 +269,6 @@ IF(WITH_QT5)
# Gui # Gui
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Gui Qt5::OpenGL) SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Gui Qt5::OpenGL)
IF(WIN32)
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::WinExtras)
ENDIF()
ADD_QT_LIBRARY(PrintSupport) ADD_QT_LIBRARY(PrintSupport)
IF(WIN32) IF(WIN32)
@ -390,10 +386,6 @@ IF(WITH_QT5)
ENDIF() ENDIF()
ELSE() ELSE()
SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core) SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)
IF(WIN32)
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::WinExtras)
ENDIF()
ENDIF() ENDIF()
ELSE() ELSE()
MESSAGE(WARNING "Unable to find Qt 5") MESSAGE(WARNING "Unable to find Qt 5")