diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-08 15:35:19 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-08 13:42:17 +0000 |
| commit | 5260c1d62a43538f6d1552e0cc409216c89786bd (patch) | |
| tree | 003592e4841f65272c5e3669639f230a0644ebec | |
| parent | 1a4f0e25830c197e67dcf9954ce1b36df5dfb339 (diff) | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 1 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6d832b8338..9f63b3eabf 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 dee9da5b56..0db814d982 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: |