diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-04-12 11:41:00 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-04-12 11:41:00 +0200 |
| commit | 415f47f38d698fd5725221c2c6dae52873b1f553 (patch) | |
| tree | 27741cdee8d478e98729707b04703382ee753dfd | |
| parent | 9522df579e1b4eff738a85344140d1449ec3377d (diff) | |
| download | extra-cmake-modules-415f47f38d698fd5725221c2c6dae52873b1f553.tar.gz extra-cmake-modules-415f47f38d698fd5725221c2c6dae52873b1f553.tar.bz2 | |
Clean up some QtQuick1 stuff.
| -rw-r--r-- | find-modules/FindQt5Transitional.cmake | 2 | ||||
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/find-modules/FindQt5Transitional.cmake b/find-modules/FindQt5Transitional.cmake index ea3cba61..577df631 100644 --- a/find-modules/FindQt5Transitional.cmake +++ b/find-modules/FindQt5Transitional.cmake @@ -24,7 +24,7 @@ if (Qt5Core_FOUND) OpenGL X11Extras Qml - Quick1 + Quick ) if (NOT Qt5Transitional_FIND_COMPONENTS) foreach(_component ${_allComponents}) diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index 02b0ef4e..4204fa54 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -165,7 +165,7 @@ set(_qt_modules Xml UiTools Qml - Quick1 + Quick WebKit WebKitWidgets Sql @@ -186,9 +186,6 @@ list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES}) list(APPEND QT_QTWEBKIT_LIBRARIES ${Qt5WebKitWidgets_LIBRARIES}) list(APPEND QT_QTWEBKIT_LIBRARY ${Qt5WebKitWidgets_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) |