qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: I5a7a09baf81353558e512800746ac24e8e8b9a47
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Alexandru Croitor 2021-04-15 12:19:01 +02:00
parent 221b2789db
commit cd7bd71d08
34 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/folderlistmodel/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmlfolderlistmodelplugin
URI "Qt.labs.folderlistmodel"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QmlFolderListModelPlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/labsanimation/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(labsanimationplugin
URI "Qt.labs.animation"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtLabsAnimationPlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/labsmodels/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(labsmodelsplugin
URI "Qt.labs.qmlmodels"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQmlLabsModelsPlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/layouts/CMakeLists.txt
View File

@ -7,7 +7,7 @@
qt_internal_add_qml_module(qquicklayoutsplugin
URI "QtQuick.Layouts"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
DESIGNER_SUPPORTED
CLASS_NAME QtQuickLayoutsPlugin
SKIP_TYPE_REGISTRATION

2
src/imports/localstorage/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmllocalstorageplugin
URI "QtQuick.LocalStorage"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QQmlLocalStoragePlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/models/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(modelsplugin
URI "QtQml.Models"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
DESIGNER_SUPPORTED
CLASS_NAME QtQmlModelsPlugin
SKIP_TYPE_REGISTRATION

2
src/imports/particles/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(particlesplugin
URI "QtQuick.Particles"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQuick2ParticlesPlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/qtqml/CMakeLists.txt
View File

@ -16,7 +16,7 @@ endif()
qt_internal_add_qml_module(qmlplugin
URI "QtQml"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
DESIGNER_SUPPORTED
CLASS_NAME QtQmlPlugin
SKIP_TYPE_REGISTRATION

2
src/imports/qtquick2/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qtquick2plugin
URI "QtQuick"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
DESIGNER_SUPPORTED
CLASS_NAME QtQuick2Plugin
SKIP_TYPE_REGISTRATION

2
src/imports/settings/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmlsettingsplugin
URI "Qt.labs.settings"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QmlSettingsPlugin
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL

2
src/imports/shapes/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmlshapesplugin
URI "QtQuick.Shapes"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QmlShapesPlugin
SKIP_TYPE_REGISTRATION
DEPENDENCIES

2
src/imports/sharedimage/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(sharedimageplugin
URI "Qt.labs.sharedimage"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQuickSharedImagePlugin
SKIP_TYPE_REGISTRATION
SOURCES

2
src/imports/testlib/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmltestplugin
URI "QtTest"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QTestQmlModule
DEPENDENCIES
QtQuick.Window/2.0

2
src/imports/tooling/CMakeLists.txt
View File

@ -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

2
src/imports/wavefrontmesh/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(qmlwavefrontmeshplugin
URI "Qt.labs.wavefrontmesh"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QmlWavefrontMeshPlugin
SKIP_TYPE_REGISTRATION
SOURCES

2
src/imports/window/CMakeLists.txt
View File

@ -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

2
src/imports/workerscript/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_internal_add_qml_module(workerscriptplugin
URI "QtQml.WorkerScript"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
DESIGNER_SUPPORTED
CLASS_NAME QtQmlWorkerScriptPlugin
SKIP_TYPE_REGISTRATION

2
src/imports/xmllistmodel/CMakeLists.txt
View File

@ -1,6 +1,6 @@
qt_internal_add_qml_module(qmlxmllistmodelplugin
URI "QtQml.XmlListModel"
VERSION "${CMAKE_PROJECT_VERSION}"
VERSION "${PROJECT_VERSION}"
CLASS_NAME QtQmlXmlListModelPlugin
SKIP_TYPE_REGISTRATION
DEPENDENCIES

2
src/labs/animation/CMakeLists.txt
View File

@ -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"

2
src/labs/folderlistmodel/CMakeLists.txt
View File

@ -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"

2
src/labs/models/CMakeLists.txt
View File

@ -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"

2
src/labs/settings/CMakeLists.txt
View File

@ -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"

2
src/labs/sharedimage/CMakeLists.txt
View File

@ -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"

2
src/labs/wavefrontmesh/CMakeLists.txt
View File

@ -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"

2
src/particles/CMakeLists.txt
View File

@ -114,7 +114,7 @@ qt_internal_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
set_target_properties(QuickParticles 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.Particles
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles"

2
src/qml/CMakeLists.txt
View File

@ -652,7 +652,7 @@ qt_internal_add_docs(Qml
set_target_properties(Qml PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI QtQml
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml"

2
src/qmllocalstorage/CMakeLists.txt
View File

@ -13,7 +13,7 @@ qt_internal_add_module(QmlLocalStorage
set_target_properties(QmlLocalStorage 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.LocalStorage
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/LocalStorage"

2
src/qmlmodels/CMakeLists.txt
View File

@ -70,7 +70,7 @@ qt_internal_add_docs(QmlModels
set_target_properties(QmlModels PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.Models
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models"

2
src/qmltest/CMakeLists.txt
View File

@ -54,7 +54,7 @@ qt_internal_add_docs(QuickTest
set_target_properties(QuickTest PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI QtTest
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtTest"

2
src/qmlworkerscript/CMakeLists.txt
View File

@ -106,7 +106,7 @@ qt_internal_add_docs(QmlWorkerScript
set_target_properties(QmlWorkerScript PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.WorkerScript
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript"

2
src/qmlxmllistmodel/CMakeLists.txt
View File

@ -20,7 +20,7 @@ qt_internal_add_docs(QmlXmlListModel
set_target_properties(QmlXmlListModel PROPERTIES
QT_QML_MODULE_INSTALL_QMLTYPES TRUE
QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
QT_QML_MODULE_VERSION ${PROJECT_VERSION}
QT_QML_MODULE_URI QtQml.XmlListModel
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/XmlListModel"

2
src/quick/CMakeLists.txt
View File

@ -514,7 +514,7 @@ qt_internal_add_docs(Quick
set_target_properties(Quick 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
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick"

2
src/quicklayouts/CMakeLists.txt
View File

@ -19,7 +19,7 @@
set_target_properties(QuickLayouts 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.Layouts
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Layouts"

2
src/quickshapes/CMakeLists.txt
View File

@ -46,7 +46,7 @@ qt_internal_add_resource(QuickShapes "qtquickshapes"
set_target_properties(QuickShapes 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.Shapes
QT_QMLTYPES_FILENAME plugins.qmltypes
QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes"