diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-02-07 22:06:53 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-02-07 22:06:53 +0100 |
| commit | 5644e0012b0270c53052bd44f192e999193e5ca0 (patch) | |
| tree | dc5acdc1b0e1894e06eb103cd59b5362597b72b4 | |
| parent | 84eb044da7473cdbd5ef774ff428ef99bc0cd8b2 (diff) | |
| download | extra-cmake-modules-5644e0012b0270c53052bd44f192e999193e5ca0.tar.gz extra-cmake-modules-5644e0012b0270c53052bd44f192e999193e5ca0.tar.bz2 | |
Add transitional code for declarative.
| -rw-r--r-- | modules/ECMQt4To5Porting.cmake | 5 | ||||
| -rw-r--r-- | modules/FindQt5Transitional.cmake | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/ECMQt4To5Porting.cmake b/modules/ECMQt4To5Porting.cmake index 8e7ea52a..50c8e635 100644 --- a/modules/ECMQt4To5Porting.cmake +++ b/modules/ECMQt4To5Porting.cmake @@ -163,6 +163,8 @@ set(_qt_modules Concurrent Xml UiTools + Declarative + Quick1 ) foreach(_module ${_qt_modules}) @@ -175,6 +177,9 @@ 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}) + macro(qt4_wrap_ui) qt5_wrap_ui(${ARGN}) endmacro() diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake index 3a2e3535..9d04e13f 100644 --- a/modules/FindQt5Transitional.cmake +++ b/modules/FindQt5Transitional.cmake @@ -7,6 +7,7 @@ if (QT5_BUILD) DBus DBusTools # For macros Designer + Declarative Script ScriptTools Network @@ -16,6 +17,7 @@ if (QT5_BUILD) Widgets PrintSupport UiTools + Quick1 ) find_package(Qt5${_component}) endforeach() |