diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-25 18:01:16 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-30 17:16:26 +0000 |
| commit | f7adf698693379ceee99d49b9b89d47cc7267f03 (patch) | |
| tree | 05b999cf055ea90c94428d8748a169e2b8c83202 /src/qml/Qt6QmlMacros.cmake | |
| parent | 2eae27db8fa6d0f5cecf8b2c7c7471d69cafd4b1 (diff) | |
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
Task-number: QTBUG-87702
Task-number: QTBUG-88425
Change-Id: I539c29fd9745b8ed2ad063ac2a82e086efc22ef0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ce35f02b338fc74e72cd25cfad111dff9f6459f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/Qt6QmlMacros.cmake')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index b6091160db..f942238572 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -403,7 +403,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() @@ -606,7 +607,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() |