From 5260c1d62a43538f6d1552e0cc409216c89786bd Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 8 Oct 2019 15:35:19 +0200 Subject: [PATCH] Update add_qml_module() to use INSTALL_QML_FILES Update add_qml_module() to use the new INSTALL_QML_FILES argument from qt6_add_qml_module(). This patch also updates pro2cmake.py to remove the QT_QML_SOURCE_INSTALL property from qml files. Change-Id: I6623b2de76bb55bd6750e48f7d45c53ca536b391 Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 1 + util/cmake/pro2cmake.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6d832b8338a..9f63b3eabfc 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2151,6 +2151,7 @@ function(add_qml_module target) TYPEINFO "${arg_TYPEINFO}" DO_NOT_INSTALL_METADATA DO_NOT_CREATE_TARGET + INSTALL_QML_FILES DEPENDENCIES ${arg_DEPENDENCIES} RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" ) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index dee9da5b56f..0db814d982f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3139,7 +3139,6 @@ def write_qml_plugin_epilogue( != qmldir_file_info.type_name ): cm_fh.write(f"{indent_1}QT_QML_SOURCE_TYPENAME {qmldir_file_info.type_name}\n") - cm_fh.write(f"{indent_1}QT_QML_SOURCE_INSTALL TRUE\n") if qmldir_file_info.singleton: cm_fh.write(f"{indent_1}QT_QML_SINGLETON_TYPE TRUE\n") if qmldir_file_info.internal: