diff options
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 7 | ||||
| -rw-r--r-- | modules/FindQt5Transitional.cmake | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index 18233ff9..79767cfe 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -163,8 +163,7 @@ set(_qt_modules Concurrent Xml UiTools - Declarative - Quick + Quick1 WebKit Sql ) @@ -179,8 +178,8 @@ endforeach() list(APPEND QT_QTCORE_LIBRARIES ${Qt5Concurrent_LIBRARIES}) list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES}) -list(APPEND QT_QTDECLARATIVE_LIBRARIES ${Qt5Quick_LIBRARIES}) -list(APPEND QT_QTDECLARATIVE_LIBRARY ${Qt5Quick_LIBRARIES}) +set(QT_QTDECLARATIVE_LIBRARIES ${Qt5Quick1_LIBRARIES}) +set(QT_QTDECLARATIVE_LIBRARY ${Qt5Quick1_LIBRARIES}) macro(qt4_wrap_ui) qt5_wrap_ui(${ARGN}) diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake index 5e67b47d..3ff9490f 100644 --- a/modules/FindQt5Transitional.cmake +++ b/modules/FindQt5Transitional.cmake @@ -9,7 +9,6 @@ if (QT5_BUILD) DBus DBusTools # For macros Designer - Declarative Script ScriptTools Network @@ -21,13 +20,16 @@ if (QT5_BUILD) PrintSupport Concurrent UiTools - Quick + Quick1 WebKit ) find_package(Qt5${_component}) endforeach() else() foreach(_component ${Qt5Transitional_FIND_COMPONENTS}) + if ("${_component}" STREQUAL "Declarative") + set(_component Quick1) + endif() find_package(Qt5${_component} REQUIRED) if ("${_component}" STREQUAL "Gui") find_package(Qt5Widgets REQUIRED) |