aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2024-02-19 18:58:19 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-02-20 22:46:15 +0000
commit723fc1ade8d17d60a71f75512afc02422d17a5ac (patch)
tree4a626418dd598726a2d12a6f795505a0c00b610d
parent3880a8902f140464bb3ccf55f77175d890bb4e0b (diff)
CMake: Add the --resource arguments to the loader response file
There can be a lot of them. Since we already have a response file, let's add them. Pick-to: 6.5 Fixes: QTBUG-116994 Change-Id: I4da068fd3892b9648fff15415614e3f8d662775a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit dfe35b2a45f8ed9fca161e02dbf2831ea2ebb5e0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 44a99a3c01abe36efc10400db0d4cf70c78a4448)
-rw-r--r--src/qml/Qt6QmlMacros.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 826206e304..38ecce69ea 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -1102,14 +1102,13 @@ function(_qt_internal_target_enable_qmlcachegen target output_targets_var qmlcac
${tool_wrapper}
${qmlcachegen}
--resource-name "${qmlcache_resource_name}"
- ${qrc_resource_args}
-o "${qmlcache_loader_cpp}"
"@${qmlcache_loader_list}"
)
file(GENERATE
OUTPUT ${qmlcache_loader_list}
- CONTENT "$<JOIN:${qmlcache_resource_paths},\n>\n"
+ CONTENT "$<JOIN:${qrc_resource_args},\n>\n$<JOIN:${qmlcache_resource_paths},\n>\n"
)
add_custom_command(