aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@qt.io>2021-09-01 17:55:18 +1000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-01 17:34:38 +0000
commitd62b61cd348ae1a7179964c2f060b9081cb19a14 (patch)
tree9dd2693b5baec786b059be4a64f6be8c0fe01297
parent18708963a5dd93c5204b9f73f0d3fae5014d600d (diff)
Remove unnecessary repeat of applying Android arch suffix
The call to qt6_add_library() already calls qt6_android_apply_arch_suffix() before it returns, so we don't need to also call it in again in qt6_add_qml_module(). Change-Id: If2ac1a642171baeb0cd8c8c2e97961268be26b3a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 6d97268b4c88d09184f796294966bd967f8fef98) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlMacros.cmake4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index c1f02fbc56..9111d77bc4 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -334,10 +334,6 @@ function(qt6_add_qml_module target)
)
else()
qt6_add_library(${target} ${lib_type})
- if(ANDROID)
- # TODO: Check if we need to do this for a backing library
- qt6_android_apply_arch_suffix(${target})
- endif()
endif()
endif()