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/imports | |
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/imports')
-rw-r--r-- | src/imports/folderlistmodel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/labsanimation/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/labsmodels/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/layouts/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/localstorage/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/models/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/particles/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/qtqml/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/qtquick2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/settings/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/shapes/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/sharedimage/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/testlib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/tooling/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/window/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/imports/workerscript/CMakeLists.txt | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index 85a43061f4..5bb72d705a 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlfolderlistmodelplugin URI "Qt.labs.folderlistmodel" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlFolderListModelPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index cdf50468ac..db26780df5 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(labsanimationplugin URI "Qt.labs.animation" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtLabsAnimationPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 0c59a15a20..7f9c3546c4 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(labsmodelsplugin URI "Qt.labs.qmlmodels" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQmlLabsModelsPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index 6cfb911ba9..09ad6a5f6f 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -7,7 +7,7 @@ qt_internal_add_qml_module(qquicklayoutsplugin URI "QtQuick.Layouts" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuickLayoutsPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index 9d7cd13fe0..9858dc0846 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmllocalstorageplugin URI "QtQuick.LocalStorage" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QQmlLocalStoragePlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 4070ad365b..8c5e0e5924 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(modelsplugin URI "QtQml.Models" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlModelsPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index 7e754a2cee..4575952579 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(particlesplugin URI "QtQuick.Particles" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQuick2ParticlesPlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 15e66fd53e..edb9c9d0ed 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -16,7 +16,7 @@ endif() qt_internal_add_qml_module(qmlplugin URI "QtQml" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlPlugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index e7e29bf9ae..e620a8feb5 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qtquick2plugin URI "QtQuick" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQuick2Plugin SKIP_TYPE_REGISTRATION diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt index f49e741106..45b84ee3f2 100644 --- a/src/imports/settings/CMakeLists.txt +++ b/src/imports/settings/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlsettingsplugin URI "Qt.labs.settings" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlSettingsPlugin SKIP_TYPE_REGISTRATION PLUGIN_OPTIONAL diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index 01b3c9506f..833304132e 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlshapesplugin URI "QtQuick.Shapes" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlShapesPlugin SKIP_TYPE_REGISTRATION DEPENDENCIES diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index b0faea295f..02c7f18177 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(sharedimageplugin URI "Qt.labs.sharedimage" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QtQuickSharedImagePlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 1e199b947b..34c790ddcf 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmltestplugin URI "QtTest" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 diff --git a/src/imports/tooling/CMakeLists.txt b/src/imports/tooling/CMakeLists.txt index c36c8c1474..48a0a19795 100644 --- a/src/imports/tooling/CMakeLists.txt +++ b/src/imports/tooling/CMakeLists.txt @@ -14,7 +14,7 @@ set(qml_files qt_internal_add_qml_module(quicktooling URI "QtQuick.tooling" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" GENERATE_QMLTYPES INSTALL_QMLTYPES PAST_MAJOR_VERSIONS 1 diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 7dd97c8056..a3c2941f97 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(qmlwavefrontmeshplugin URI "Qt.labs.wavefrontmesh" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" CLASSNAME QmlWavefrontMeshPlugin SKIP_TYPE_REGISTRATION SOURCES diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 1f02b1a380..4a6015f8f4 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -2,7 +2,7 @@ qt_internal_add_qml_module(quickwindow URI "QtQuick.Window" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" IMPORTS QtQuick/auto PAST_MAJOR_VERSIONS 2 diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index b2a6d0f444..2071a068c9 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -6,7 +6,7 @@ qt_internal_add_qml_module(workerscriptplugin URI "QtQml.WorkerScript" - VERSION "${CMAKE_PROJECT_VERSION}" + VERSION "${PROJECT_VERSION}" DESIGNER_SUPPORTED CLASSNAME QtQmlWorkerScriptPlugin SKIP_TYPE_REGISTRATION |