From 503343c00415d2193e36d8d22415c6cd2a304986 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 18 Aug 2021 12:15:16 +0200 Subject: CMake: Remove dead example-specific metatypes installation code All projects (including examples) have ported away from using INSTALL_LOCATION and thus setting the QT_QML_MODULE_INSTALL_DIR property as part of the work done in 1c4ba17015fe99da48ce73fab75ecc60cf9cb975 Thus the work around to install the example metatypes files is not needed anymore. Furthermore qt6_extract_metatypes will be modified to not install json files by default anymore because the public API should not be handling that. Remove the dead code. Amends ee72ba123894bb92bcdd448d8a08eb1504d043eb Pick-to: 6.2 Task-number: QTBUG-95845 Change-Id: I0cfb4424cb79a059a2ecc337c9e4603b09154c63 Reviewed-by: Craig Scott Reviewed-by: Joerg Bornemann --- src/qml/Qt6QmlBuildInternals.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/qml/Qt6QmlBuildInternals.cmake') diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index e33f59bb95..8bc8b292fe 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -233,14 +233,6 @@ function(qt_internal_add_qml_module target) ) endif() endif() - - # FIXME: Some repos expect this to be set and use it to install other - # things relative to it. They should just specify the install - # location directly. Once the other repos have been updated to - # not rely on this, remove this property. - set_target_properties(${arg_PLUGIN_TARGET} PROPERTIES - QT_QML_MODULE_INSTALL_DIR ${arg_INSTALL_DIRECTORY} - ) endif() # TODO: Check if we need arg_SOURCES in this condition -- cgit v1.2.3