From 3a9b5162e6983c1fe825e50988f953895a3a9838 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 17 Aug 2021 20:15:11 +0200 Subject: [PATCH] Collect QT_QML_ROOT_PATH based from the project resources Use the _qt_internal_collect_qml_root_paths function to collect qml files from the resources. The function is called only if Qml module is found. Pick-to: 6.2 Task-number: QTBUG-93340 Change-Id: I2b5f51e3d7fb8aa82f46e88b2aac5e52bf0930d5 Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia --- src/corelib/Qt6CoreMacros.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 6170615d5e..390ff27e1c 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1738,6 +1738,12 @@ function(_qt_internal_process_resource target resourceName) endforeach() endif() + if(ANDROID) + if(COMMAND _qt_internal_collect_qml_root_paths) + _qt_internal_collect_qml_root_paths(${target} ${resource_files}) + endif() + endif() + if(NOT rcc_PREFIX) get_target_property(rcc_PREFIX ${target} QT_RESOURCE_PREFIX) if (NOT rcc_PREFIX)