diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-01 16:03:00 +0200 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-01 14:07:24 +0000 |
commit | e60af03e2faee1b20cbbf722bcc57f06fcd793fe (patch) | |
tree | 0d9b1481515bbf7be5e5fcd6c63427088382ca7c | |
parent | 5b0db35531756e2bc060573fc119d703e0fa14e9 (diff) |
Update qml modules
Updated qml modules to be compatible with the latest changes to
add_qml_modules.
Change-Id: I3342a1375bfa64a16fb0c54f812c56bad173f73c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/imports/builtins/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/folderlistmodel/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/labsanimation/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/labsmodels/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/layouts/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/localstorage/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/models/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/imports/particles/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/imports/qtqml/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/qtqml/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/imports/settings/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/shapes/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/sharedimage/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/statemachine/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/testlib/CMakeLists.txt | 23 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/imports/window/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/imports/workerscript/CMakeLists.txt | 6 |
19 files changed, 84 insertions, 55 deletions
diff --git a/src/imports/builtins/.prev_CMakeLists.txt b/src/imports/builtins/.prev_CMakeLists.txt new file mode 100644 index 0000000000..088b0b73f0 --- /dev/null +++ b/src/imports/builtins/.prev_CMakeLists.txt @@ -0,0 +1,2 @@ +# Generated from builtins.pro. + diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index 1b88eb3311..98ef78f3ff 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlfolderlistmodelplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/folderlistmodel" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "Qt.labs.folderlistmodel" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES fileinfothread.cpp fileinfothread_p.h fileproperty_p.h diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index ff28718871..f16650a3bb 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(labsanimationplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/animation" - IMPORT_VERSION "1.0" + CPP_PLUGIN + URI "Qt.labs.animation" + VERSION "1.0" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index b6e2de1dbb..df2bdd9e93 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(labsmodelsplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/qmlmodels" - IMPORT_VERSION "1.0" + CPP_PLUGIN + URI "Qt.labs.qmlmodels" + VERSION "1.0" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index 02e4028b1c..371ebc360d 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qquicklayoutsplugin - INSTALL_QML_FILES - TARGET_PATH "QtQuick/Layouts" - IMPORT_VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQuick.Layouts" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp qquickgridlayoutengine.cpp qquickgridlayoutengine_p.h diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 7ed0e84ff6..b919eb6921 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmllocalstorageplugin - INSTALL_QML_FILES - TARGET_PATH "QtQuick/LocalStorage" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQuick.LocalStorage" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index cd29d674cf..3e3b9cb77a 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qml_module(modelsplugin - INSTALL_QML_FILES + CPP_PLUGIN + URI "QtQml.Models.2" TARGET_PATH "QtQml/Models.2" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index af5979fbf7..04d556e9fa 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qml_module(particlesplugin - INSTALL_QML_FILES + CPP_PLUGIN + URI "QtQuick.Particles.2" TARGET_PATH "QtQuick/Particles.2" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index d760e4b391..9c76939c6c 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlplugin - INSTALL_QML_FILES - TARGET_PATH "QtQml" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQml" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 9f638c27b8..50ee3350c6 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlplugin - INSTALL_QML_FILES - TARGET_PATH "QtQml" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQml" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 0f5532bebd..57d9493324 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qml_module(qtquick2plugin - INSTALL_QML_FILES + CPP_PLUGIN + URI "QtQuick.2" TARGET_PATH "QtQuick.2" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index caadd24f4c..2e74582e4d 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlsettingsplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/settings" - IMPORT_VERSION "1.1" + CPP_PLUGIN + URI "Qt.labs.settings" + VERSION "1.1" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp qqmlsettings.cpp qqmlsettings_p.h diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index a2dac7fcd0..ccc99f0154 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlshapesplugin - INSTALL_QML_FILES - TARGET_PATH "QtQuick/Shapes" - IMPORT_VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQuick.Shapes" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index 3ea0cd8edd..31935e61f4 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(sharedimageplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/sharedimage" - IMPORT_VERSION "1.0" + CPP_PLUGIN + URI "Qt.labs.sharedimage" + VERSION "1.0" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp qsharedimageloader.cpp qsharedimageloader_p.h diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index f862e4cdb8..76e95687a3 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qtqmlstatemachine - INSTALL_QML_FILES - TARGET_PATH "QtQml/StateMachine" - IMPORT_VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "QtQml.StateMachine" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES childrenprivate.h finalstate.cpp finalstate.h diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 8c1ec5b350..36f74a4f6b 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -5,13 +5,10 @@ ##################################################################### add_qml_module(qmltestplugin - INSTALL_QML_FILES - TARGET_PATH "QtTest" - IMPORT_VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" - QML_FILES - TestCase.qml - SignalSpy.qml - testlogger.js + CPP_PLUGIN + URI "QtTest" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES main.cpp LIBRARIES @@ -26,10 +23,18 @@ add_qml_module(qmltestplugin Qt::Test ) +# QML Files +add_qt_resource(qmltestplugin qmake_QtTest + PREFIX + "/qt-project.org/imports/QtTest" + FILES + TestCase.qml + SignalSpy.qml + testlogger.js +) + #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" # OTHER_FILES = "testlib.json" -# QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" -# TARGETPATH = "QtTest" # _LOADED = "qml_plugin" diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 06e81f6f19..dac61917d1 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -5,9 +5,10 @@ ##################################################################### add_qml_module(qmlwavefrontmeshplugin - INSTALL_QML_FILES - TARGET_PATH "Qt/labs/wavefrontmesh" - IMPORT_VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + CPP_PLUGIN + URI "Qt.labs.wavefrontmesh" + VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp qwavefrontmesh.cpp qwavefrontmesh.h diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 877d558d39..dee302d7c6 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qml_module(windowplugin - INSTALL_QML_FILES + CPP_PLUGIN + URI "QtQuick.Window.2" TARGET_PATH "QtQuick/Window.2" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index bccd618154..3ecf1a90a2 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qml_module(workerscriptplugin - INSTALL_QML_FILES + CPP_PLUGIN + URI "QtQml.WorkerScript.2" TARGET_PATH "QtQml/WorkerScript.2" - IMPORT_VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + RESOURCE_PREFIX "/qt-project.org/imports" SOURCES plugin.cpp LIBRARIES |