summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2023-05-16 13:05:43 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2023-05-17 08:13:26 +0000
commita6a15d0ef9d2a91af23221cabdbe454225631e09 (patch)
tree5cd9a4221ebb96faff2f9cf323041e632ab18057
parentad0825d42c1ddfe24ac7489fb324ec0635b45d85 (diff)
downloadqbs-a6a15d0ef9d2a91af23221cabdbe454225631e09.tar.gz
Fix an Android testHEADmaster
This one must not use qbs.architectures from the profile Change-Id: Ia806e0f070a748b83303fdd794d70583f1b2b97e Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--tests/auto/blackbox/testdata-android/multiple-apks-per-project/product1/product1.qbs5
1 files changed, 4 insertions, 1 deletions
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
}