diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 12:34:56 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 22:23:40 +0200 |
| commit | 22e3b6d2292ded526354569a1ffb342a660f1f80 (patch) | |
| tree | b99fe56e901b88e951022466bad6dc66feac359d /src/imports/controls/universal | |
| parent | 85c5d6ad22948f0963dad97fe0ed504668992dc8 (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/universal')
| -rw-r--r-- | src/imports/controls/universal/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/impl/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
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 |