aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-04-15 12:34:56 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2021-04-15 22:23:40 +0200
commit22e3b6d2292ded526354569a1ffb342a660f1f80 (patch)
treeb99fe56e901b88e951022466bad6dc66feac359d /src/imports/controls
parent85c5d6ad22948f0963dad97fe0ed504668992dc8 (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. Pick-to: 6.1 6.0 Task-number: QTBUG-92861 Change-Id: Ifd12d6309f358b9b72372a5c069141ecb7322bc7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/CMakeLists.txt2
-rw-r--r--src/imports/controls/basic/CMakeLists.txt2
-rw-r--r--src/imports/controls/basic/impl/CMakeLists.txt2
-rw-r--r--src/imports/controls/fusion/CMakeLists.txt2
-rw-r--r--src/imports/controls/fusion/impl/CMakeLists.txt2
-rw-r--r--src/imports/controls/imagine/CMakeLists.txt2
-rw-r--r--src/imports/controls/imagine/impl/CMakeLists.txt2
-rw-r--r--src/imports/controls/macos/CMakeLists.txt2
-rw-r--r--src/imports/controls/material/CMakeLists.txt2
-rw-r--r--src/imports/controls/material/impl/CMakeLists.txt2
-rw-r--r--src/imports/controls/universal/CMakeLists.txt2
-rw-r--r--src/imports/controls/universal/impl/CMakeLists.txt2
-rw-r--r--src/imports/controls/windows/CMakeLists.txt2
13 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt
index 3d97efad..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 "${CMAKE_PROJECT_VERSION}"
+ 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 805ef1f1..ee7dc6c8 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 "${CMAKE_PROJECT_VERSION}"
+ VERSION "${PROJECT_VERSION}"
CLASSNAME QtQuickControls2BasicStylePlugin
GENERATE_QMLTYPES
INSTALL_QMLTYPES
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 60b1c9af..f2b755c5 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 "${CMAKE_PROJECT_VERSION}"
+ 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 1e1b733a..b37bce6a 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 "${CMAKE_PROJECT_VERSION}"
+ 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 8e3cc29d..286f25b8 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 "${CMAKE_PROJECT_VERSION}"
+ 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 336813a1..af7cde66 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 "${CMAKE_PROJECT_VERSION}"
+ 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 cd0b338a..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 "${CMAKE_PROJECT_VERSION}"
+ VERSION "${PROJECT_VERSION}"
CLASSNAME QtQuickControls2WindowsStylePlugin
IMPORTS
QtQuick.Controls.Fusion/auto