diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-02-12 12:02:45 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-02-12 12:03:41 +0100 |
| commit | 2ce55e30a2f22c2f1d560c952fece041e8e87b5f (patch) | |
| tree | 09652c9b90bbcd1363746b18224c618d83f774f4 | |
| parent | bbfe7308e15fb20435e0634ee614ad40226e675e (diff) | |
| download | extra-cmake-modules-2ce55e30a2f22c2f1d560c952fece041e8e87b5f.tar.gz extra-cmake-modules-2ce55e30a2f22c2f1d560c952fece041e8e87b5f.tar.bz2 | |
Rename QtQuick1 to QtQuick.
It has been renamed upstream.
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 6 | ||||
| -rw-r--r-- | modules/FindQt5Transitional.cmake | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index a0e14c10..0df4237d 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -164,7 +164,7 @@ set(_qt_modules Xml UiTools Declarative - Quick1 + Quick WebKit ) @@ -178,8 +178,8 @@ endforeach() list(APPEND QT_QTCORE_LIBRARIES ${Qt5Concurrent_LIBRARIES}) list(APPEND QT_QTCORE_LIBRARY ${Qt5Concurrent_LIBRARIES}) -list(APPEND QT_QTDECLARATIVE_LIBRARIES ${Qt5Quick1_LIBRARIES}) -list(APPEND QT_QTDECLARATIVE_LIBRARY ${Qt5Quick1_LIBRARIES}) +list(APPEND QT_QTDECLARATIVE_LIBRARIES ${Qt5Quick_LIBRARIES}) +list(APPEND QT_QTDECLARATIVE_LIBRARY ${Qt5Quick_LIBRARIES}) macro(qt4_wrap_ui) qt5_wrap_ui(${ARGN}) diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake index ccefd100..e820609c 100644 --- a/modules/FindQt5Transitional.cmake +++ b/modules/FindQt5Transitional.cmake @@ -18,7 +18,7 @@ if (QT5_BUILD) PrintSupport Concurrent UiTools - Quick1 + Quick WebKit ) find_package(Qt5${_component}) |