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: Ifd12d6309f358b9b72372a5c069141ecb7322bc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 22e3b6d2292ded526354569a1ffb342a660f1f80)

19 files changed, 19 insertions, 19 deletions

diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
index 637e267f..38454f99 100644
--- a/src/imports/controls/CMakeLists.txt
+++ b/src/imports/controls/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2plugin
     URI "QtQuick.Controls"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuickControls2Plugin
     SKIP_TYPE_REGISTRATION
diff --git a/src/imports/controls/basic/CMakeLists.txt b/src/imports/controls/basic/CMakeLists.txt
index aded888b..243a4168 100644
--- a/src/imports/controls/basic/CMakeLists.txt
+++ b/src/imports/controls/basic/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
     URI "QtQuick.Controls.Basic"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2BasicStylePlugin
     GENERATE_QMLTYPES
     SOURCES
diff --git a/src/imports/controls/basic/impl/CMakeLists.txt b/src/imports/controls/basic/impl/CMakeLists.txt
index 2e60dcf1..2ae6cf75 100644
--- a/src/imports/controls/basic/impl/CMakeLists.txt
+++ b/src/imports/controls/basic/impl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
     URI "QtQuick.Controls.Basic.impl"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2BasicStyleImplPlugin
     SKIP_TYPE_REGISTRATION
     GENERATE_QMLTYPES
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt
index cd2db561..7e049adc 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/imports/controls/fusion/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
     URI "QtQuick.Controls.Fusion"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2FusionStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/imports/controls/fusion/impl/CMakeLists.txt b/src/imports/controls/fusion/impl/CMakeLists.txt
index af5900bc..d80e69e8 100644
--- a/src/imports/controls/fusion/impl/CMakeLists.txt
+++ b/src/imports/controls/fusion/impl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
     URI "QtQuick.Controls.Fusion.impl"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2FusionStyleImplPlugin
     GENERATE_QMLTYPES
     INSTALL_QMLTYPES
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt
index d49c3977..4b027f36 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/imports/controls/imagine/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
     URI "QtQuick.Controls.Imagine"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2ImagineStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/imports/controls/imagine/impl/CMakeLists.txt b/src/imports/controls/imagine/impl/CMakeLists.txt
index 3ddec611..61d53907 100644
--- a/src/imports/controls/imagine/impl/CMakeLists.txt
+++ b/src/imports/controls/imagine/impl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
     URI "QtQuick.Controls.Imagine.impl"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2ImagineStyleImplPlugin
     GENERATE_QMLTYPES
     INSTALL_QMLTYPES
diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt
index 4d0b7653..bdd45a29 100644
--- a/src/imports/controls/macos/CMakeLists.txt
+++ b/src/imports/controls/macos/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
     URI "QtQuick.Controls.macOS"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2MacOSStylePlugin
     IMPORTS
         QtQuick.Controls.Fusion/auto
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index 7ba455e7..5ed702fc 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
     URI "QtQuick.Controls.Material"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2MaterialStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/imports/controls/material/impl/CMakeLists.txt b/src/imports/controls/material/impl/CMakeLists.txt
index b9558d79..01ab8221 100644
--- a/src/imports/controls/material/impl/CMakeLists.txt
+++ b/src/imports/controls/material/impl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
     URI "QtQuick.Controls.Material.impl"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2MaterialStyleImplPlugin
     GENERATE_QMLTYPES
     INSTALL_QMLTYPES
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt
index 64cf5d75..d4dc8d62 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/imports/controls/universal/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
     URI "QtQuick.Controls.Universal"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2UniversalStylePlugin
     IMPORTS
         QtQuick.Controls.Basic/auto
diff --git a/src/imports/controls/universal/impl/CMakeLists.txt b/src/imports/controls/universal/impl/CMakeLists.txt
index 793d9e24..1c1f5984 100644
--- a/src/imports/controls/universal/impl/CMakeLists.txt
+++ b/src/imports/controls/universal/impl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
     URI "QtQuick.Controls.Universal.impl"
-    VERSION "${CMAKE_PROJECT_VERSION}"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2UniversalStyleImplPlugin
     GENERATE_QMLTYPES
     INSTALL_QMLTYPES
diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt
index ef838134..0b552919 100644
--- a/src/imports/controls/windows/CMakeLists.txt
+++ b/src/imports/controls/windows/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
     URI "QtQuick.Controls.Windows"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2WindowsStylePlugin
     IMPORTS
         QtQuick.Controls.Fusion/auto
diff --git a/src/imports/controlsimpl/CMakeLists.txt b/src/imports/controlsimpl/CMakeLists.txt
index 3ffc396c..1613024a 100644
--- a/src/imports/controlsimpl/CMakeLists.txt
+++ b/src/imports/controlsimpl/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2implplugin
     URI "QtQuick.Controls.impl"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2ImplPlugin
     SKIP_TYPE_REGISTRATION
     SOURCES
diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt
index 942e0fc3..da46732e 100644
--- a/src/imports/nativestyle/CMakeLists.txt
+++ b/src/imports/nativestyle/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
     URI "QtQuick.NativeStyle"
-    VERSION "6.0"
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickControls2NativeStylePlugin
     DEPENDENCIES
         QtQuick.Controls/auto
diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt
index 0339fd99..ada7cb59 100644
--- a/src/imports/templates/CMakeLists.txt
+++ b/src/imports/templates/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 qt_internal_add_qml_module(qtquicktemplates2plugin
     URI "QtQuick.Templates"
-    VERSION "6.0" # special case
+    VERSION "${PROJECT_VERSION}"
     CLASSNAME QtQuickTemplates2Plugin
     DEPENDENCIES
         QtQuick/auto
diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt
index 79b617b3..fb3bf748 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols2/CMakeLists.txt
@@ -35,7 +35,7 @@ qt_internal_add_module(QuickControls2
 
 set_target_properties(QuickControls2 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.Controls
     QT_QMLTYPES_FILENAME plugins.qmltypes
     QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Controls"
diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrols2impl/CMakeLists.txt
index 6f952c5a..ebb04af0 100644
--- a/src/quickcontrols2impl/CMakeLists.txt
+++ b/src/quickcontrols2impl/CMakeLists.txt
@@ -55,7 +55,7 @@ qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview
 
 set_target_properties(QuickControls2Impl 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.Controls.impl
     QT_QMLTYPES_FILENAME plugins.qmltypes
     QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Controls/impl"
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
index c02627b5..cbe724d6 100644
--- a/src/quicktemplates2/CMakeLists.txt
+++ b/src/quicktemplates2/CMakeLists.txt
@@ -156,7 +156,7 @@ qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AN
 
 set_target_properties(QuickTemplates2 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.Templates
     QT_QMLTYPES_FILENAME plugins.qmltypes
     QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Templates"