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

CMake: Workaround fix to not install example metatypes.json files 

We should not pollute the Qt install prefix lib/metatypes folder with
json files that were built as part of examples. Work around this, by
checking if the example qml module has an install path specified,
and install there instead.

Task-number: QTBUG-84403
Change-Id: I55fab7f4e2b02a74e28cf343a1aeecf59201d7cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-05-28 18:52:53 +02:00
parent dc6b76d85d
commit ee72ba1238
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qml/Qt6QmlMacros.cmake
View File

@ -464,7 +464,18 @@ function(qt6_qml_type_registration target)
endif()
endif()
qt6_generate_meta_types_json_file(${target})
# 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 "")
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()
qt6_generate_meta_types_json_file(${target} ${meta_types_json_args})
get_target_property(import_version ${target} QT_QML_MODULE_VERSION)
get_target_property(target_source_dir ${target} SOURCE_DIR)
@ -592,7 +603,6 @@ function(qt6_qml_type_registration target)
# warn the user, and don't install the file.
get_target_property(install_qmltypes ${target} QT_QML_MODULE_INSTALL_QMLTYPES)
if (install_qmltypes)
get_target_property(qml_install_dir ${target} QT_QML_MODULE_INSTALL_DIR)
if(qml_install_dir)
if(NOT DEFINED QT_WILL_INSTALL OR QT_WILL_INSTALL)
install(FILES ${plugin_types_file} DESTINATION "${qml_install_dir}")