From d62b61cd348ae1a7179964c2f060b9081cb19a14 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Wed, 1 Sep 2021 17:55:18 +1000 Subject: 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 Reviewed-by: Ulf Hermann Reviewed-by: Andrei Golubev Reviewed-by: Joerg Bornemann (cherry picked from commit 6d97268b4c88d09184f796294966bd967f8fef98) Reviewed-by: Qt Cherry-pick Bot --- src/qml/Qt6QmlMacros.cmake | 4 ---- 1 file changed, 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() -- cgit v1.2.3