diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-18 12:15:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-18 15:28:17 +0200 |
commit | 503343c00415d2193e36d8d22415c6cd2a304986 (patch) | |
tree | 894ae79d1c4bfeffcc717415a91ff47a9aefcbfa /src | |
parent | 2cbc7cc296220f778d20f39368321cd565343afc (diff) |
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 <craig.scott@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 8 | ||||
-rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 11 |
2 files changed, 0 insertions, 19 deletions
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 diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 219c8e3dc2..f259201c71 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1605,18 +1605,7 @@ function(qt6_qml_type_registration target) endif() endif() - # Horrible hack workaround to not install metatypes.json files for examples/ qml plugins into - # ${qt_prefix}/lib/meta_types. - # Put them into QT_QML_MODULE_INSTALL_DIR/lib/meta_types instead. - get_target_property(qml_install_dir ${target} QT_QML_MODULE_INSTALL_DIR) set(meta_types_json_args "") - - # TODO: This is internal Qt logic, it should be moved out of here. - if(QT_BUILDING_QT AND QT_WILL_INSTALL AND qml_install_dir AND - qml_install_dir MATCHES "^${INSTALL_EXAMPLESDIR}") - set(meta_types_json_args "INSTALL_DIR" "${qml_install_dir}/lib/metatypes") - endif() - if(arg_MANUAL_MOC_JSON_FILES) list(APPEND meta_types_json_args "MANUAL_MOC_JSON_FILES" ${arg_MANUAL_MOC_JSON_FILES}) endif() |