summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-04-15 12:40:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-16 12:20:23 +0000
commit8952a2e1225cfa52739a1a92e172fa36daa27f92 (patch)
treecd896b1283cf811849dafbb413527a6375c5b2eb
parentce9cb0e84a674e9a797fcd95aac7372c2b028336 (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: I94ff185cf5f37b19959e620921b9c97fde1bfc07 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d1bd4d78d7361f5d909be3184ce8bab8c5417945) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick3d/imports/animation/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/core/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/extras/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/input/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/logic/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/render/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/scene2d/CMakeLists.txt2
-rw-r--r--src/quick3d/imports/scene3d/CMakeLists.txt2
-rw-r--r--src/quick3d/quick3d/CMakeLists.txt2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/quick3d/imports/animation/CMakeLists.txt b/src/quick3d/imports/animation/CMakeLists.txt
index e68005171..621356d97 100644
--- a/src/quick3d/imports/animation/CMakeLists.txt
+++ b/src/quick3d/imports/animation/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3danimationplugin
URI "Qt3D.Animation"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DAnimationPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/core/CMakeLists.txt b/src/quick3d/imports/core/CMakeLists.txt
index 0843a436c..a8229bd0f 100644
--- a/src/quick3d/imports/core/CMakeLists.txt
+++ b/src/quick3d/imports/core/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3dcoreplugin
URI "Qt3D.Core"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DCorePlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/extras/CMakeLists.txt b/src/quick3d/imports/extras/CMakeLists.txt
index 79f849f64..b3d2636f0 100644
--- a/src/quick3d/imports/extras/CMakeLists.txt
+++ b/src/quick3d/imports/extras/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3dextrasplugin
URI "Qt3D.Extras"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DExtrasPlugin
DEPENDENCIES
Qt3D.Logic/2.0
diff --git a/src/quick3d/imports/input/CMakeLists.txt b/src/quick3d/imports/input/CMakeLists.txt
index 257472022..6201a0b74 100644
--- a/src/quick3d/imports/input/CMakeLists.txt
+++ b/src/quick3d/imports/input/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3dinputplugin
URI "Qt3D.Input"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DInputPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/logic/CMakeLists.txt b/src/quick3d/imports/logic/CMakeLists.txt
index 9cf595ab9..2d7b5ea9b 100644
--- a/src/quick3d/imports/logic/CMakeLists.txt
+++ b/src/quick3d/imports/logic/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3dlogicplugin
URI "Qt3D.Logic"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DLogicPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/render/CMakeLists.txt b/src/quick3d/imports/render/CMakeLists.txt
index fc9a5ee23..c0f352c89 100644
--- a/src/quick3d/imports/render/CMakeLists.txt
+++ b/src/quick3d/imports/render/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(quick3drenderplugin
URI "Qt3D.Render"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME Qt3DQuick3DRenderPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/scene2d/CMakeLists.txt b/src/quick3d/imports/scene2d/CMakeLists.txt
index e5fa0682e..aeb119f6c 100644
--- a/src/quick3d/imports/scene2d/CMakeLists.txt
+++ b/src/quick3d/imports/scene2d/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(qtquickscene2dplugin
URI "QtQuick.Scene2D"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME QtQuickScene2DPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/imports/scene3d/CMakeLists.txt b/src/quick3d/imports/scene3d/CMakeLists.txt
index e6297dec8..722f33bed 100644
--- a/src/quick3d/imports/scene3d/CMakeLists.txt
+++ b/src/quick3d/imports/scene3d/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_qml_module(qtquickscene3dplugin
URI "QtQuick.Scene3D"
- VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
+ VERSION "2.${PROJECT_VERSION_MINOR}"
CLASSNAME QtQuickScene3DPlugin
SKIP_TYPE_REGISTRATION
SOURCES
diff --git a/src/quick3d/quick3d/CMakeLists.txt b/src/quick3d/quick3d/CMakeLists.txt
index ccb9271fd..f9d11b320 100644
--- a/src/quick3d/quick3d/CMakeLists.txt
+++ b/src/quick3d/quick3d/CMakeLists.txt
@@ -56,7 +56,7 @@ qt_internal_extend_target(3DQuick CONDITION gcov
)
set_target_properties(3DQuick PROPERTIES
- QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
+ QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI Qt3D.Core
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QMLTYPES_FILENAME plugins.qmltypes