aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2024-04-15 17:07:28 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-04-17 01:38:51 +0000
commited33c7c1122b1b38a9b8f08469142a774c2133a7 (patch)
tree7fb063dcdaa6bbb313006ef47d5aa378fb016eda
parent5b386f4735da43a31c7f73779b7f5f1b8fa217a6 (diff)
Android: Restore accidentally deleted deduplication of QML root paths
Amends commit 12486c4b0d532b1d3f6717b64d6eed01ed720948. Pick-to: 6.5 Change-Id: I814c2b7595d5db9c650112b6980173d42708b005 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit eed6941ef0c16c8d70281dd0cc6ddd0efed07bbe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6AndroidQmlMacros.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/Qt6AndroidQmlMacros.cmake b/src/qml/Qt6AndroidQmlMacros.cmake
index 7e94e7060d..5f6f01fd76 100644
--- a/src/qml/Qt6AndroidQmlMacros.cmake
+++ b/src/qml/Qt6AndroidQmlMacros.cmake
@@ -89,6 +89,7 @@ function(_qt_internal_collect_qml_root_paths target)
endforeach()
endif()
+ list(REMOVE_DUPLICATES qml_root_paths)
set_target_properties(${target} PROPERTIES _qt_internal_qml_root_path "${qml_root_paths}")
endfunction()