1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update add_qml_module() to use INSTALL_QML_FILES

Browse Source 
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>
This commit is contained in:
Leander Beernaert 2019-10-08 15:35:19 +02:00
parent 1a4f0e2583
commit 5260c1d62a
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBuild.cmake
View File

@ -2151,6 +2151,7 @@ function(add_qml_module target)
TYPEINFO "${arg_TYPEINFO}" TYPEINFO "${arg_TYPEINFO}"
DO_NOT_INSTALL_METADATA DO_NOT_INSTALL_METADATA
DO_NOT_CREATE_TARGET DO_NOT_CREATE_TARGET
INSTALL_QML_FILES
DEPENDENCIES ${arg_DEPENDENCIES} DEPENDENCIES ${arg_DEPENDENCIES}
RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
) )

1
util/cmake/pro2cmake.py
View File

@ -3139,7 +3139,6 @@ def write_qml_plugin_epilogue(
!= qmldir_file_info.type_name != 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_TYPENAME {qmldir_file_info.type_name}\n")
cm_fh.write(f"{indent_1}QT_QML_SOURCE_INSTALL TRUE\n")
if qmldir_file_info.singleton: if qmldir_file_info.singleton:
cm_fh.write(f"{indent_1}QT_QML_SINGLETON_TYPE TRUE\n") cm_fh.write(f"{indent_1}QT_QML_SINGLETON_TYPE TRUE\n")
if qmldir_file_info.internal: if qmldir_file_info.internal: