diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 12:19:01 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-16 16:35:29 +0200 |
commit | 8079f57a5f80450edb23965867d29e6b6454afd1 (patch) | |
tree | 2b04b7ec02be9ee4847ee7d89a7f6b48c982c783 | |
parent | d4f5ae4f50837444f988edcd68b6bf9b8c8e5265 (diff) |
CMake: Fix qml module version to use the repo project version
Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the
repo project version is used in a top-level build, rather
than the version of the qt5 project.
Task-number: QTBUG-92861
Change-Id: I5a7a09baf81353558e512800746ac24e8e8b9a47
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit cd7bd71d08f1c21648756d0a9fd501ce37a8cc0c)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
32 files changed, 32 insertions, 32 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index 85a43061f4..5bb72d705a 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlfolderlistmodelplugin URI "Qt.labs.folderlistmodel" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlFolderListModelPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index cdf50468ac..db26780df5 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(labsanimationplugin URI "Qt.labs.animation" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtLabsAnimationPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 0c59a15a20..7f9c3546c4 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(labsmodelsplugin URI "Qt.labs.qmlmodels" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQmlLabsModelsPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index 6cfb911ba9..09ad6a5f6f 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -7,7 +7,7 @@ qt_internal_add_qml_module(qquicklayoutsplugin URI "QtQuick.Layouts" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuickLayoutsPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 9d7cd13fe0..9858dc0846 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmllocalstorageplugin URI "QtQuick.LocalStorage" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QQmlLocalStoragePlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 4070ad365b..8c5e0e5924 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(modelsplugin URI "QtQml.Models" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 7e754a2cee..4575952579 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(particlesplugin URI "QtQuick.Particles" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQuick2ParticlesPlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 15e66fd53e..edb9c9d0ed 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_internal_add_qml_module(qmlplugin URI "QtQml" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index e7e29bf9ae..e620a8feb5 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qtquick2plugin URI "QtQuick" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index f49e741106..45b84ee3f2 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlsettingsplugin URI "Qt.labs.settings" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlSettingsPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index 01b3c9506f..833304132e 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlshapesplugin URI "QtQuick.Shapes" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlShapesPlugin SKIP_TYPE_REGISTRATION DEPENDENCIES diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index b0faea295f..02c7f18177 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(sharedimageplugin URI "Qt.labs.sharedimage" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQuickSharedImagePlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 1e199b947b..34c790ddcf 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmltestplugin URI "QtTest" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 diff --git a/src/imports/tooling/CMakeLists.txt b/src/imports/tooling/CMakeLists.txt index c36c8c1474..48a0a19795 100644 --- a/src/imports/tooling/CMakeLists.txt +++ b/src/imports/tooling/CMakeLists.txt @@ -14,7 +14,7 @@ set(qml_files qt_internal_add_qml_module(quicktooling URI "QtQuick.tooling" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" GENERATE_QMLTYPES INSTALL_QMLTYPES PAST_MAJOR_VERSIONS 1 diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 7dd97c8056..a3c2941f97 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlwavefrontmeshplugin URI "Qt.labs.wavefrontmesh" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlWavefrontMeshPlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 1f02b1a380..4a6015f8f4 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -2,7 +2,7 @@ qt_internal_add_qml_module(quickwindow URI "QtQuick.Window" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" IMPORTS QtQuick/auto PAST_MAJOR_VERSIONS 2 diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index b2a6d0f444..2071a068c9 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(workerscriptplugin URI "QtQml.WorkerScript" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin SKIP_TYPE_REGISTRATION diff --git a/src/labs/animation/CMakeLists.txt b/src/labs/animation/CMakeLists.txt index 77b8ab7fec..6c1cdcae14 100644 --- a/src/labs/animation/CMakeLists.txt +++ b/src/labs/animation/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_module(LabsAnimation set_target_properties(LabsAnimation PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.animation QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/animation" diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt index 7f087a0a6e..6994bbf658 100644 --- a/src/labs/folderlistmodel/CMakeLists.txt +++ b/src/labs/folderlistmodel/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(LabsFolderListModel set_target_properties(LabsFolderListModel PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.folderlistmodel QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/folderlistmodel" diff --git a/src/labs/models/CMakeLists.txt b/src/labs/models/CMakeLists.txt index bfd7109bca..774513d8c6 100644 --- a/src/labs/models/CMakeLists.txt +++ b/src/labs/models/CMakeLists.txt @@ -22,7 +22,7 @@ qt_internal_extend_target(LabsQmlModels CONDITION QT_FEATURE_qml_delegate_model set_target_properties(LabsQmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.qmlmodels QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/qmlmodels" diff --git a/src/labs/settings/CMakeLists.txt b/src/labs/settings/CMakeLists.txt index 23b5018dd5..4dc99ea7d8 100644 --- a/src/labs/settings/CMakeLists.txt +++ b/src/labs/settings/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_module(LabsSettings set_target_properties(LabsSettings PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.settings QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/settings" diff --git a/src/labs/sharedimage/CMakeLists.txt b/src/labs/sharedimage/CMakeLists.txt index 217f688599..a360fc1002 100644 --- a/src/labs/sharedimage/CMakeLists.txt +++ b/src/labs/sharedimage/CMakeLists.txt @@ -15,7 +15,7 @@ qt_internal_add_module(LabsSharedImage set_target_properties(LabsSharedImage PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.sharedimage QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/sharedimage" diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt index bdd4b07b07..df02526af4 100644 --- a/src/labs/wavefrontmesh/CMakeLists.txt +++ b/src/labs/wavefrontmesh/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(LabsWavefrontMesh set_target_properties(LabsWavefrontMesh PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.wavefrontmesh QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/wavefrontmesh" diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 538e1e5bae..9ffa6564c2 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -115,7 +115,7 @@ qt_internal_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov" set_target_properties(QuickParticles PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Particles QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index f59f1d8f23..fbdcc59191 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -651,7 +651,7 @@ qt_internal_add_docs(Qml set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQml QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" diff --git a/src/qmllocalstorage/CMakeLists.txt b/src/qmllocalstorage/CMakeLists.txt index 7c6846dce1..9a4d5f048b 100644 --- a/src/qmllocalstorage/CMakeLists.txt +++ b/src/qmllocalstorage/CMakeLists.txt @@ -13,7 +13,7 @@ qt_internal_add_module(QmlLocalStorage set_target_properties(QmlLocalStorage PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.LocalStorage QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/LocalStorage" diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index bb8974fe55..6f613f2d68 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -70,7 +70,7 @@ qt_internal_add_docs(QmlModels set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQml.Models QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 0e9d5c73f6..afeebd3189 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -54,7 +54,7 @@ qt_internal_add_docs(QuickTest set_target_properties(QuickTest PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtTest QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtTest" diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 5143edabde..4b9b2ebcd5 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -106,7 +106,7 @@ qt_internal_add_docs(QmlWorkerScript set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 4583a29433..f158a40210 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -518,7 +518,7 @@ qt_internal_add_docs(Quick set_target_properties(Quick PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQuick QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" diff --git a/src/quicklayouts/CMakeLists.txt b/src/quicklayouts/CMakeLists.txt index 3524f5e4ba..4ba60c0390 100644 --- a/src/quicklayouts/CMakeLists.txt +++ b/src/quicklayouts/CMakeLists.txt @@ -19,7 +19,7 @@ set_target_properties(QuickLayouts PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Layouts QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Layouts" diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index ac2615c47b..3e8fbc4173 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -46,7 +46,7 @@ qt_internal_add_resource(QuickShapes "qtquickshapes" set_target_properties(QuickShapes PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI QtQuick.Shapes QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" |