diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 12:19:01 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-16 16:35:29 +0200 |
| commit | 8079f57a5f80450edb23965867d29e6b6454afd1 (patch) | |
| tree | 2b04b7ec02be9ee4847ee7d89a7f6b48c982c783 /src/labs | |
| parent | d4f5ae4f50837444f988edcd68b6bf9b8c8e5265 (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.
Task-number: QTBUG-92861
Change-Id: I5a7a09baf81353558e512800746ac24e8e8b9a47
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit cd7bd71d08f1c21648756d0a9fd501ce37a8cc0c)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/labs')
| -rw-r--r-- | src/labs/animation/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/labs/folderlistmodel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/labs/models/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/labs/settings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/labs/sharedimage/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/labs/wavefrontmesh/CMakeLists.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/labs/animation/CMakeLists.txt b/src/labs/animation/CMakeLists.txt index 77b8ab7fec..6c1cdcae14 100644 --- a/src/labs/animation/CMakeLists.txt +++ b/src/labs/animation/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_module(LabsAnimation set_target_properties(LabsAnimation PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.animation QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/animation" diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt index 7f087a0a6e..6994bbf658 100644 --- a/src/labs/folderlistmodel/CMakeLists.txt +++ b/src/labs/folderlistmodel/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(LabsFolderListModel set_target_properties(LabsFolderListModel PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.folderlistmodel QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/folderlistmodel" diff --git a/src/labs/models/CMakeLists.txt b/src/labs/models/CMakeLists.txt index bfd7109bca..774513d8c6 100644 --- a/src/labs/models/CMakeLists.txt +++ b/src/labs/models/CMakeLists.txt @@ -22,7 +22,7 @@ qt_internal_extend_target(LabsQmlModels CONDITION QT_FEATURE_qml_delegate_model set_target_properties(LabsQmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.qmlmodels QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/qmlmodels" diff --git a/src/labs/settings/CMakeLists.txt b/src/labs/settings/CMakeLists.txt index 23b5018dd5..4dc99ea7d8 100644 --- a/src/labs/settings/CMakeLists.txt +++ b/src/labs/settings/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_module(LabsSettings set_target_properties(LabsSettings PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.settings QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/settings" diff --git a/src/labs/sharedimage/CMakeLists.txt b/src/labs/sharedimage/CMakeLists.txt index 217f688599..a360fc1002 100644 --- a/src/labs/sharedimage/CMakeLists.txt +++ b/src/labs/sharedimage/CMakeLists.txt @@ -15,7 +15,7 @@ qt_internal_add_module(LabsSharedImage set_target_properties(LabsSharedImage PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.sharedimage QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/sharedimage" diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt index bdd4b07b07..df02526af4 100644 --- a/src/labs/wavefrontmesh/CMakeLists.txt +++ b/src/labs/wavefrontmesh/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_module(LabsWavefrontMesh set_target_properties(LabsWavefrontMesh PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} + QT_QML_MODULE_VERSION ${PROJECT_VERSION} QT_QML_MODULE_URI Qt.labs.wavefrontmesh QT_QMLTYPES_FILENAME plugins.qmltypes QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/labs/wavefrontmesh" |