diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-12-14 09:53:37 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-15 22:00:37 +0000 |
| commit | d2843cd026139889e5d89738e90636b05f98796c (patch) | |
| tree | f2d30ae9a4c59ddd7f648d5522e5af714a2eeadf /src/qml/Qt6QmlMacros.cmake | |
| parent | 65b9520415afd77a323b826f84db86e8c292b120 (diff) | |
CMake: Restore dependencies of qmlcachegen invocation
It depends on the qmldir and the qmltypes file.
Change-Id: I737e32365e4cd65237317685acd2e6ca08b500ea
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit ee1705cd9afebd8d937ed121ca427a411abcf6f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/Qt6QmlMacros.cmake')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index afa705f0d2..b92549b791 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1611,6 +1611,7 @@ function(qt6_target_qml_sources target) # but that's not fatal. set(qmldir_file ${output_dir}/qmldir) + _qt_internal_genex_getproperty(qmltypes_file ${target} QT_QML_MODULE_PLUGIN_TYPES_FILE) _qt_internal_genex_getproperty(qmlcachegen ${target} QT_QMLCACHEGEN_EXECUTABLE) _qt_internal_genex_getproperty(direct_calls ${target} QT_QMLCACHEGEN_DIRECT_CALLS) _qt_internal_genex_getjoinedproperty(arguments ${target} @@ -1864,7 +1865,8 @@ function(qt6_target_qml_sources target) ${qmlcachegen_cmd} "${file_absolute}" $<TARGET_PROPERTY:${target},_qt_generated_qrc_files> - "$<$<BOOL:${types_file}>:${types_file}>" + "$<$<BOOL:${qmltypes_file}>:${qmltypes_file}>" + "${qmldir_file}" ) target_sources(${target} PRIVATE ${compiled_file}) |