diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-28 13:28:57 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-29 14:33:47 +0000 |
| commit | ba0ac519e3f4acb3fb73ff68393624ec855918aa (patch) | |
| tree | f91e7b75fd750522f45bed72bea85bb7257f61f8 /cmake | |
| parent | 7590f07278ae2cc4ddade7668b5c34ce16751260 (diff) | |
Update qmltypes to use the new metatypes dependency format
The foreign types list for qmltypesregistrar is now generated by
recursively processing the ${targets}_metatypes_dep.txt file.
At build time we now use a custom script
(Qt6QmlResolveDependencies.cmake) to generate the final foreign types
file.
qmltypesregistrar has also been updated in order to support the
resolution of response files supplied to the command line arguments.
Change-Id: Ib61d82fa92bf5d5a24631f461248f81147aad947
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtDeclarativeSetup.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/QtDeclarativeSetup.cmake b/cmake/QtDeclarativeSetup.cmake index 2cd6f56127..116b6013a0 100644 --- a/cmake/QtDeclarativeSetup.cmake +++ b/cmake/QtDeclarativeSetup.cmake @@ -46,3 +46,13 @@ function(qt_declarative_generate_reg_exp_jit_tables consuming_target) target_sources(${consuming_target} PRIVATE ${output_file}) target_include_directories(${consuming_target} PRIVATE $<BUILD_INTERFACE:${generate_dir}>) endfunction() + +# special case to set the qmltype resolve dependencies script at build time +set(QT_QMTYPES_RESOLVE_DEPENDENCIES_SCRIPT + "${CMAKE_CURRENT_SOURCE_DIR}/src/qml/Qt6QmlResolveMetatypesDependencies.cmake" +) + +# install QmlResolveDependency script +qt_copy_or_install(FILES "src/qml/Qt6QmlResolveMetatypesDependencies.cmake" + DESTINATION "${QT_CONFIG_INSTALL_DIR}/${INSTALL_CMAKE_NAMESPACE}Qml" +) |