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>

23 files changed, 23 insertions, 23 deletions

diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index f1e543ad9f..cfe7428f96 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
     GENERATE_QMLTYPES
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index fa460034f2..75f721955b 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
     GENERATE_QMLTYPES
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index e859f75fa9..4537f679c6 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
     GENERATE_QMLTYPES
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index 1beb4ee126..b1482b6be1 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -6,7 +6,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 305d9ad178..1466082cc9 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
     GENERATE_QMLTYPES
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 c5c76135ba..73023207bb 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
     GENERATE_QMLTYPES
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 78f6d9f448..c66f401d64 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
     SOURCES
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index 90020be7ee..0f4289f904 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
     GENERATE_QMLTYPES
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index d340823a87..ac523b8579 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 85065589ec..0409ffbdde 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
     GENERATE_QMLTYPES
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/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 8e977687cc..8d76f5949d 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/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/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 e9e456c949..83a635b92a 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -517,7 +517,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/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"