diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 16:29:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-17 09:18:05 +0100 |
| commit | f66a5c2d61a66585eaca7d01b6749974f37b94be (patch) | |
| tree | bd175edf9315bafa41d85316a1e17812dc722e83 /util/cmake/pro2cmake.py | |
| parent | 605a36800f8d0eed7095242b30b574372809d3fd (diff) | |
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 <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util/cmake/pro2cmake.py')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index d1e96a8fd1..76302aa01d 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" |