diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2021-01-12 16:29:32 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-01-13 10:31:42 +0100 |
commit | 6d9c0fafd968cde677cbc16dcba7ae47b67eb750 (patch) | |
tree | 040b341e6736e1181dba254a32a4367471db9c82 /src | |
parent | 46a7aba3178f4ac97be3c88ed00f98eb04d45e56 (diff) |
Use CMAKE_PROJECT_VERSION for VERSION of QML modules
This ensures that the modules provide versions matching the current Qt
version.
Change-Id: I164b54af60de3b2b6ca6f54c417eb58b1eafd1e5
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/controls/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/basic/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/fusion/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/imagine/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/material/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/universal/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controls/windows/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/controlsimpl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/nativestyle/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/templates/CMakeLists.txt | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index 637e267f..3d97efad 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 "${CMAKE_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..28c0d398 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2BasicStylePlugin GENERATE_QMLTYPES SOURCES diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index cd2db561..a1e79784 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2FusionStylePlugin IMPORTS QtQuick.Controls.Basic/auto diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index d49c3977..832e87e6 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImagineStylePlugin IMPORTS QtQuick.Controls.Basic/auto diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index 7ba455e7..2547a0f8 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2MaterialStylePlugin IMPORTS QtQuick.Controls.Basic/auto diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index 64cf5d75..ce19c5d2 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2UniversalStylePlugin IMPORTS QtQuick.Controls.Basic/auto diff --git a/src/imports/controls/windows/CMakeLists.txt b/src/imports/controls/windows/CMakeLists.txt index ef838134..cd0b338a 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 "${CMAKE_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..9d8049f5 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImplPlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt index 942e0fc3..ccc44d62 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2NativeStylePlugin DEPENDENCIES QtQuick.Controls/auto diff --git a/src/imports/templates/CMakeLists.txt b/src/imports/templates/CMakeLists.txt index 0339fd99..cd6a68f9 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 "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickTemplates2Plugin DEPENDENCIES QtQuick/auto |