From 22e3b6d2292ded526354569a1ffb342a660f1f80 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 15 Apr 2021 12:34:56 +0200 Subject: 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 --- src/imports/controls/material/CMakeLists.txt | 2 +- src/imports/controls/material/impl/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/material') 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 -- cgit v1.2.3