diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-10-25 15:30:37 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-10-25 15:30:37 +0200 |
| commit | c93d3ac8c50ef000f17aabb394ddde2c53785892 (patch) | |
| tree | 7d985fc42d58fd010d89a8766e157bb5252fac90 | |
| parent | 244169e7d2b21b9eb1d7cdf79c6f249eaf8dbb80 (diff) | |
| download | extra-cmake-modules-c93d3ac8c50ef000f17aabb394ddde2c53785892.tar.gz extra-cmake-modules-c93d3ac8c50ef000f17aabb394ddde2c53785892.tar.bz2 | |
QtQuick1 is renamed QtDeclarative.
| -rw-r--r-- | find-modules/FindQt5Transitional.cmake | 5 | ||||
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/find-modules/FindQt5Transitional.cmake b/find-modules/FindQt5Transitional.cmake index 46dca9cf..1a707e73 100644 --- a/find-modules/FindQt5Transitional.cmake +++ b/find-modules/FindQt5Transitional.cmake @@ -8,6 +8,7 @@ if (Qt5Core_FOUND) Gui DBus Designer + Declarative Script ScriptTools Network @@ -19,7 +20,6 @@ if (Qt5Core_FOUND) PrintSupport Concurrent UiTools - Quick1 WebKit OpenGL ) @@ -27,9 +27,6 @@ if (Qt5Core_FOUND) 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) diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index 49d242a3..ce797ebd 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -153,6 +153,7 @@ set(QT_QTGUI_LIBRARY ${QT_QTGUI_LIBRARIES}) set(_qt_modules Core + Declarative Widgets Script ScriptTools @@ -163,7 +164,6 @@ set(_qt_modules Concurrent Xml UiTools - Quick1 WebKit Sql OpenGL @@ -180,9 +180,6 @@ endforeach() list(APPEND QT_QTCORE_LIBRARIES ${Qt5Concurrent_LIBRARIES}) list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES}) -set(QT_QTDECLARATIVE_LIBRARIES ${Qt5Quick1_LIBRARIES}) -set(QT_QTDECLARATIVE_LIBRARY ${Qt5Quick1_LIBRARIES}) - get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake LOCATION) get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) if (TARGET Qt5::uic) |