diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 12:52:57 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 14:54:59 +0200 |
| commit | 9223814afed7691fbf650fd28b0d365f71a29656 (patch) | |
| tree | 33e6fddbc9af0cd4f89eadbce47c3cc0360e040a /src | |
| parent | 7518bbbab7f8c5df021a253cd4bf264dde20e743 (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: I696ca5b6c47bf59cb27a463a46cfd3222fb71df6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/timeline/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/timeline/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/timeline/CMakeLists.txt b/src/imports/timeline/CMakeLists.txt index 9b6bde7..9b1068c 100644 --- a/src/imports/timeline/CMakeLists.txt +++ b/src/imports/timeline/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qtquicktimelineplugin URI "QtQuick.Timeline" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuickTimelinePlugin SKIP_TYPE_REGISTRATION diff --git a/src/timeline/CMakeLists.txt b/src/timeline/CMakeLists.txt index 193c378..d995e31 100644 --- a/src/timeline/CMakeLists.txt +++ b/src/timeline/CMakeLists.txt @@ -18,7 +18,7 @@ qt_internal_add_module(QuickTimeline set_target_properties(QuickTimeline 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.Timeline QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Timeline" |