From a7c7e7ceaa47b915748f6701c5b558771682d532 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 28 May 2020 17:04:10 +0200 Subject: CMake: Don't install .qmltypes for Qt tests, examples and tools that don't have an explicit QT_QML_MODULE_INSTALL_DIR path specified. We don't want to pollute the Qt qml import path with these files. Task-number: QTBUG-84403 Change-Id: I768267e0e79daa8090d882c301648cce14e1a809 Reviewed-by: Qt CI Bot Reviewed-by: Joerg Bornemann --- examples/qml/qmlextensionplugins/CMakeLists.txt | 1 - examples/qml/referenceexamples/adding/CMakeLists.txt | 1 - examples/qml/referenceexamples/attached/CMakeLists.txt | 1 - examples/qml/referenceexamples/binding/CMakeLists.txt | 1 - examples/qml/referenceexamples/coercion/CMakeLists.txt | 1 - examples/qml/referenceexamples/default/CMakeLists.txt | 1 - examples/qml/referenceexamples/extended/CMakeLists.txt | 1 - examples/qml/referenceexamples/grouped/CMakeLists.txt | 1 - examples/qml/referenceexamples/methods/CMakeLists.txt | 1 - examples/qml/referenceexamples/properties/CMakeLists.txt | 1 - examples/qml/referenceexamples/signal/CMakeLists.txt | 1 - examples/qml/referenceexamples/valuesource/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt | 1 - examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt | 1 - .../tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt | 1 - .../qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt | 1 - .../qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt | 1 - 18 files changed, 18 deletions(-) (limited to 'examples/qml') diff --git a/examples/qml/qmlextensionplugins/CMakeLists.txt b/examples/qml/qmlextensionplugins/CMakeLists.txt index e1c975c735..de6f9c4685 100644 --- a/examples/qml/qmlextensionplugins/CMakeLists.txt +++ b/examples/qml/qmlextensionplugins/CMakeLists.txt @@ -43,7 +43,6 @@ install(TARGETS qmlqtimeexampleplugin ) set_target_properties(qmlqtimeexampleplugin PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI TimeExample QT_QMLTYPES_FILENAME imports/TimeExample/plugins.qmltypes diff --git a/examples/qml/referenceexamples/adding/CMakeLists.txt b/examples/qml/referenceexamples/adding/CMakeLists.txt index 3974a6237a..2e408bc21e 100644 --- a/examples/qml/referenceexamples/adding/CMakeLists.txt +++ b/examples/qml/referenceexamples/adding/CMakeLists.txt @@ -47,7 +47,6 @@ install(TARGETS adding ) set_target_properties(adding PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/attached/CMakeLists.txt b/examples/qml/referenceexamples/attached/CMakeLists.txt index 48d37bf024..f0ab82e33b 100644 --- a/examples/qml/referenceexamples/attached/CMakeLists.txt +++ b/examples/qml/referenceexamples/attached/CMakeLists.txt @@ -50,7 +50,6 @@ install(TARGETS attached ) set_target_properties(attached PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/binding/CMakeLists.txt b/examples/qml/referenceexamples/binding/CMakeLists.txt index 3a45d85c79..130baf47ec 100644 --- a/examples/qml/referenceexamples/binding/CMakeLists.txt +++ b/examples/qml/referenceexamples/binding/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS binding ) set_target_properties(binding PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/coercion/CMakeLists.txt b/examples/qml/referenceexamples/coercion/CMakeLists.txt index 7be8c6cf2d..9afaa87082 100644 --- a/examples/qml/referenceexamples/coercion/CMakeLists.txt +++ b/examples/qml/referenceexamples/coercion/CMakeLists.txt @@ -48,7 +48,6 @@ install(TARGETS coercion ) set_target_properties(coercion PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/default/CMakeLists.txt b/examples/qml/referenceexamples/default/CMakeLists.txt index 1826bcf183..cfb1942345 100644 --- a/examples/qml/referenceexamples/default/CMakeLists.txt +++ b/examples/qml/referenceexamples/default/CMakeLists.txt @@ -48,7 +48,6 @@ install(TARGETS default ) set_target_properties(default PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/extended/CMakeLists.txt b/examples/qml/referenceexamples/extended/CMakeLists.txt index aa0165e78b..fcc7619608 100644 --- a/examples/qml/referenceexamples/extended/CMakeLists.txt +++ b/examples/qml/referenceexamples/extended/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS extended ) set_target_properties(extended PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/grouped/CMakeLists.txt b/examples/qml/referenceexamples/grouped/CMakeLists.txt index 31d0a006f5..f14028d422 100644 --- a/examples/qml/referenceexamples/grouped/CMakeLists.txt +++ b/examples/qml/referenceexamples/grouped/CMakeLists.txt @@ -50,7 +50,6 @@ install(TARGETS grouped ) set_target_properties(grouped PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/methods/CMakeLists.txt b/examples/qml/referenceexamples/methods/CMakeLists.txt index a03743375e..476fb9fd4b 100644 --- a/examples/qml/referenceexamples/methods/CMakeLists.txt +++ b/examples/qml/referenceexamples/methods/CMakeLists.txt @@ -48,7 +48,6 @@ install(TARGETS methods ) set_target_properties(methods PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/properties/CMakeLists.txt b/examples/qml/referenceexamples/properties/CMakeLists.txt index 2d3f6ef713..8125f11659 100644 --- a/examples/qml/referenceexamples/properties/CMakeLists.txt +++ b/examples/qml/referenceexamples/properties/CMakeLists.txt @@ -48,7 +48,6 @@ install(TARGETS properties ) set_target_properties(properties PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/signal/CMakeLists.txt b/examples/qml/referenceexamples/signal/CMakeLists.txt index 5d6a454776..37a178a631 100644 --- a/examples/qml/referenceexamples/signal/CMakeLists.txt +++ b/examples/qml/referenceexamples/signal/CMakeLists.txt @@ -50,7 +50,6 @@ install(TARGETS signal ) set_target_properties(signal PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/referenceexamples/valuesource/CMakeLists.txt b/examples/qml/referenceexamples/valuesource/CMakeLists.txt index 2fbea883ff..ed7209730c 100644 --- a/examples/qml/referenceexamples/valuesource/CMakeLists.txt +++ b/examples/qml/referenceexamples/valuesource/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS valuesource ) set_target_properties(valuesource PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI People ) diff --git a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt index c3d58e4f9e..c2b21948bd 100644 --- a/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS chapter1-basics ) set_target_properties(chapter1-basics PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) diff --git a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt index 62a6fc4a59..b47f42329e 100644 --- a/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS chapter2-methods ) set_target_properties(chapter2-methods PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt index 3556f82ab6..de68f8f3b8 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt @@ -51,7 +51,6 @@ install(TARGETS chapter3-bindings ) set_target_properties(chapter3-bindings PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt index 1cfbe930b7..45055fc2cb 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt @@ -52,7 +52,6 @@ install(TARGETS chapter4-customPropertyTypes ) set_target_properties(chapter4-customPropertyTypes PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt index bfc3138774..48620d9c5c 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt @@ -52,7 +52,6 @@ install(TARGETS chapter5-listproperties ) set_target_properties(chapter5-listproperties PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt index e91406d1ff..8031a1b5de 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/CMakeLists.txt @@ -46,7 +46,6 @@ install(TARGETS chartsplugin ) set_target_properties(chartsplugin PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.0 QT_QML_MODULE_URI Charts ) -- cgit v1.2.3