diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-05 14:53:43 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-06 10:33:21 +0000 |
| commit | 3a93ef098936b2a6d831d5acb7bcbfe65787f45c (patch) | |
| tree | 398ebd3f62c250491080e6908c3d91781aaaf1ce /src | |
| parent | e60af03e2faee1b20cbbf722bcc57f06fcd793fe (diff) | |
Update qml modules
Updated qml modules to be compatible with the latest changes to
add_qml_modules.
Change-Id: I37965db931d44e02a18fb0d5948e0c4439ff0852
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/particles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/testlib/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/imports/window/CMakeLists.txt | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 04d556e9fa..d0f74a8e89 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -17,6 +17,8 @@ add_qml_module(particlesplugin Qt::QuickParticlesPrivate Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Core + Qt::Gui Qt::Qml Qt::Quick Qt::QuickParticles diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 57d9493324..d5814d27e0 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -17,6 +17,8 @@ add_qml_module(qtquick2plugin Qt::QmlPrivate Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Core + Qt::Gui Qt::Qml Qt::QmlModels Qt::Quick diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 36f74a4f6b..f203d75838 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -17,6 +17,7 @@ add_qml_module(qmltestplugin Qt::QuickTestPrivate PUBLIC_LIBRARIES Qt::Core + Qt::Gui Qt::Qml Qt::Quick Qt::QuickTest @@ -33,6 +34,14 @@ add_qt_resource(qmltestplugin qmake_QtTest testlogger.js ) +qt_install_qml_files(qmltestplugin + FILES + TestCase.qml + SignalSpy.qml + testlogger.js +) + + #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index dee302d7c6..caf7c48043 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -16,6 +16,8 @@ add_qml_module(windowplugin Qt::QmlPrivate Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::Core + Qt::Gui Qt::Qml Qt::Quick ) |