diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 13:53:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 14:05:23 +0000 |
| commit | 14492ecee2e34843efd3ef070503a43a48552055 (patch) | |
| tree | 37432296f2f6bbc596d2470f79c99ce68801567c /src/qmlworkerscript | |
| parent | 26c5243491f495194f04b449128dae36118e28da (diff) | |
CMake: Regenerate and adapt to merge from devwip/cmake
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'src/qmlworkerscript')
| -rw-r--r-- | src/qmlworkerscript/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0b48e41a13..ad1a578f14 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -49,10 +49,10 @@ qt_add_module(QmlWorkerScript ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -106,7 +106,7 @@ qt_add_docs(QmlWorkerScript set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index d5e83794e5..e85d1174e1 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -49,10 +49,10 @@ qt_add_module(QmlWorkerScript ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: -# IMPORT_VERSION = "2.15" # QMLTYPES_FILENAME = "plugins.qmltypes" # QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQml/WorkerScript" # QML_IMPORT_NAME = "QtQml.WorkerScript" +# QML_IMPORT_VERSION = "$$QT_VERSION" ## Scopes: ##################################################################### @@ -106,7 +106,7 @@ qt_add_docs(QmlWorkerScript set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION 2.15 + QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) |