From a6a15d0ef9d2a91af23221cabdbe454225631e09 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 16 May 2023 13:05:43 +0200 Subject: Fix an Android test This one must not use qbs.architectures from the profile Change-Id: Ia806e0f070a748b83303fdd794d70583f1b2b97e Reviewed-by: Ivan Komissarov --- .../testdata-android/multiple-apks-per-project/product1/product1.qbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs index 61accd6dd..c7b9b3de2 100644 --- a/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs +++ b/tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs @@ -7,7 +7,10 @@ Project { qbs.targetPlatform: "android" Properties { condition: qbs.toolchain.includes("clang"); Android.ndk.appStl: "c++_shared" } Android.ndk.appStl: "stlport_shared" - qbs.architectures: !qbs.architecture ? ["armv7a", "x86"] : undefined + Properties { + qbs.architectures: !qbs.architecture ? ["armv7a", "x86"] : undefined + overrideListProperties: true + } cpp.useRPaths: false } -- cgit v1.2.1