From 4bc09456144d2f95756bf09708181f95f40a69a0 Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@qt.io>
Date: Wed, 9 Jun 2021 18:05:43 +1000
Subject: Pass the --resource argument to qmlcachegen

The qrc files are needed to analyze relations between the different
QML files.

Change-Id: I288434a0822de7b9e55696c90f768eb9e5283ffc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
(cherry picked from commit 919e16acaeac6e92f5f402f0d81cf988c5b02cf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/qml/Qt6QmlMacros.cmake | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 2e50b43111..66a47fcf87 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -675,10 +675,15 @@ function(_qt_internal_target_enable_qmlcachegen target output_targets_var)
     set(qmlcache_resource_paths "$<TARGET_PROPERTY:${target},QT_QML_MODULE_RESOURCE_PATHS>")
     set(qmlcache_have_resource_paths "$<BOOL:${qmlcache_resource_paths}>")
 
+    _qt_internal_genex_getjoinedproperty(qrc_resource_args ${target}
+        _qt_generated_qrc_files "--resource$<SEMICOLON>" "$<SEMICOLON>"
+    )
+
     set(cmd
         ${QT_TOOL_COMMAND_WRAPPER_PATH}
         $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen>
         --resource-name "${qmlcache_resource_name}"
+        ${qrc_resource_args}
         -o "${qmlcache_loader_cpp}"
         "@${qmlcache_loader_list}"
     )
@@ -694,8 +699,9 @@ function(_qt_internal_target_enable_qmlcachegen target output_targets_var)
         COMMAND "$<${qmlcache_have_resource_paths}:${cmd}>"
         COMMAND_EXPAND_LISTS
         DEPENDS
-        ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen
-        ${qmlcache_loader_list}
+            ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen
+            ${qmlcache_loader_list}
+            $<TARGET_PROPERTY:${target},_qt_generated_qrc_files>
     )
 
     # TODO: Probably need to reject ${target} being an object library as unsupported
@@ -1192,11 +1198,15 @@ function(qt6_target_qml_sources target)
         _qt_internal_genex_getjoinedproperty(import_paths ${target}
             QT_QML_IMPORT_PATH "-I$<SEMICOLON>" "$<SEMICOLON>"
         )
+        _qt_internal_genex_getjoinedproperty(qrc_resource_args ${target}
+            _qt_generated_qrc_files "--resource$<SEMICOLON>" "$<SEMICOLON>"
+        )
         set(cachegen_args
             "$<${have_import_paths}:${import_paths}>"
             "$<${have_types_file}:-i$<SEMICOLON>${types_file}>"
             "$<${have_direct_calls}:--direct-calls>"
             "$<${have_qmljs_runtime}:--qmljs-runtime>"
+            ${qrc_resource_args}
         )
     endif()
 
@@ -1362,6 +1372,7 @@ function(qt6_target_qml_sources target)
                 DEPENDS
                     ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen
                     "${file_absolute}"
+                    $<TARGET_PROPERTY:${target},_qt_generated_qrc_files>
                     "$<$<BOOL:${types_file}>:${types_file}>"
             )
 
-- 
cgit v1.2.3