diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-26 17:18:57 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 20:15:13 +0000 |
| commit | a74aee385f90775236f3d73ca62acc752a4a9770 (patch) | |
| tree | 4b7b2dd18e2177326c2e44b6628a11381d837183 /src | |
| parent | 98cbb96efcd6937309493c9732d5b2839b5ee8c4 (diff) | |
CMake: Fix broken static plugins linking
Restore prefix of generated qml files resources. Non-prefixed
resource names break static linking of qml plugins.
Amends 08eb485a006dc2baca42eb280ae60e9f0fc00dff
Change-Id: Idb489536b9b863232300609ec595c6f5c29daf3e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f16f477eba8415f9edfd5d4b220ab8a565051410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 9d815d3593..b6091160db 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -583,7 +583,7 @@ function(qt6_target_qml_files target) math(EXPR new_count "${resource_count} + 1") set_target_properties(${target} PROPERTIES QT6_QML_MODULE_ADD_QML_FILES_COUNT ${new_count}) - qt6_add_resources(${target} "qml_files_${new_count}" + qt6_add_resources(${target} "${target}_qml_files_${new_count}" FILES ${arg_FILES} OUTPUT_TARGETS resource_targets ) |