diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-11-23 18:05:24 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-24 14:31:23 +0000 |
| commit | 951a4cb3a9c66efac574826cf6fe7aca02a5e101 (patch) | |
| tree | da357a7aac60604e5ec0e2eac9cfd7f63282ba7d /src/qml | |
| parent | b788ef085c66d95aa75052c079d9d2fe15bc7f16 (diff) | |
CMake: Change generated resources naming
Remove redundant 'target' prefix for generated resource name for qml
files. It's expected that 'qt6_add_resources' will created resource
targets prefixed with '${target}_'.
Fixes: QTBUG-88581
Change-Id: Ie63fce11931a2cb566aa1902a77227ef86ca1ea8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 08eb485a006dc2baca42eb280ae60e9f0fc00dff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 7cf2e9bef4..9d815d3593 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -389,9 +389,7 @@ function(qt6_add_qml_module target) PROPERTIES QT_RESOURCE_ALIAS "qmldir" ) - set(resource_target "Foo") qt6_add_resources(${target} ${qmldir_resource_name} - PREFIX ${target_resource_prefix} FILES "${qmldir_file}" OUTPUT_TARGETS resource_targets ) @@ -585,8 +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}) - # TODO: Fix this if it blows up on Windows due to too long target name. - qt6_add_resources(${target} "${target}_qml_files_resource_${new_count}" + qt6_add_resources(${target} "qml_files_${new_count}" FILES ${arg_FILES} OUTPUT_TARGETS resource_targets ) |