From f66a5c2d61a66585eaca7d01b6749974f37b94be Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 16 Mar 2020 16:29:17 +0100 Subject: [PATCH] CMake: pro2cmake: Handle javascript files not present in qmldir If a file is present in a QML_FILES variable inside a qmake .pro file, but is not listed in the static qmldir file, mark the file so no qmldir entry created for it. Change-Id: I3ec77b6eedf70ea9124bf7f447ee3477204bc4f7 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann --- util/cmake/pro2cmake.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index d1e96a8fd1f..76302aa01d1 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3654,6 +3654,11 @@ def write_qml_plugin_epilogue( if qmldir_file_info.internal: cm_fh.write(f"{indent_1}QT_QML_INTERNAL_TYPE TRUE\n") cm_fh.write(f"{indent_0})\n") + else: + cm_fh.write( + f"{indent_0}set_source_files_properties({qml_file} PROPERTIES\n" + f"{indent_1}QT_QML_SKIP_QMLDIR_ENTRY TRUE\n" + f"{indent_0})\n") cm_fh.write( f"\n{indent_0}qt6_target_qml_files({target}\n{indent_1}FILES\n"