From ce35f02b338fc74e72cd25cfad111dff9f6459f4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 25 Nov 2020 18:01:16 +0100 Subject: CMake: Fix resource object file paths in qml plugin prl files Pass the new INSTALL_LOCATION argument to qt_internal_record_rcc_object_files to ensure correct paths to resource object files in plugin prl files. Amends 8a54a6fc2efd13f0310ec71793f624cdf28bd1c9 Pick-to: 6.0 dev Task-number: QTBUG-87702 Task-number: QTBUG-88425 Change-Id: I539c29fd9745b8ed2ad063ac2a82e086efc22ef0 Reviewed-by: Joerg Bornemann --- src/qml/Qt6QmlMacros.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 7cf2e9bef4..b160c29a44 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -405,7 +405,8 @@ function(qt6_add_qml_module target) # When building a static Qt, we need to record information about the compiled resource # object files to embed them into .prl files. if(COMMAND qt_internal_record_rcc_object_files) - qt_internal_record_rcc_object_files("${target}" "${resource_targets}") + qt_internal_record_rcc_object_files( + "${target}" "${resource_targets}" INSTALL_LOCATION "${arg_INSTALL_LOCATION}") endif() endif() else() @@ -609,7 +610,8 @@ function(qt6_target_qml_files target) # When building a static Qt, we need to record information about the compiled resource # object files to embed them into .prl files. if(COMMAND qt_internal_record_rcc_object_files) - qt_internal_record_rcc_object_files("${target}" "${resource_targets}") + qt_internal_record_rcc_object_files( + "${target}" "${resource_targets}" INSTALL_LOCATION "${qml_module_install_dir}") endif() endif() -- cgit v1.2.3