diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-19 15:24:53 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-19 15:50:50 +0200 |
| commit | 69133908c13c07f4b4c8ffa4d868dd40663f9d20 (patch) | |
| tree | 6b6a4bbf5f4470f47cc2e1ac665e9d6e0afa8f09 | |
| parent | b780deba1b4fc0ad0a4269d40b9a65e9488a70db (diff) | |
Fix qmltypes file names for qmltypes built from libraries
We still expect those to be called "plugins.qmltypes" in a few places.
Change-Id: I751b2bb9ca264fb7998d11c2f969ee46b32fb2cb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmlmodels/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/quick/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 381a76cb12..ecab712a47 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -627,6 +627,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" + QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(Qml) diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 069ea4a01e..083807dd31 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -73,6 +73,7 @@ set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.Models QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" + QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QmlModels) diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index c75deac6ad..ad2e5bcded 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -69,6 +69,7 @@ set_target_properties(QuickTest PROPERTIES QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Qt.test.qtestroot QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/Qt/test/qtestroot" + QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QuickTest) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index e85d1174e1..828974ee45 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -109,6 +109,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQml.WorkerScript QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" + QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 0b0c3e0538..e09d243e4e 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -617,6 +617,7 @@ set_target_properties(Quick PROPERTIES QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} QT_QML_MODULE_URI QtQuick QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" + QT_QMLTYPES_FILENAME "plugins.qmltypes" ) qt6_qml_type_registration(Quick) |