aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-12-06 00:59:30 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-12-07 14:27:08 +0000
commit3fd350296fd3e67483b6c8d1013f15ab121f1421 (patch)
treea70adad86a6e3aba0ddc1deab2e31db0256818d7 /tests
parentdb7d4cf37bfd2b04397f2ec80c2cefb4085286ec (diff)
xcode: brings back arm64 mac in aggregateDependencyLinking()
Xcode 12.2 supports building arm64 mac binaries (again) Change-Id: Iacdeda5d0b933781694cab0e38f720ee2ffe3461 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/tst_blackboxapple.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index d87b1a539..79dbab58f 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -273,7 +273,7 @@ void TestBlackboxApple::aggregateDependencyLinking()
const auto xcodeVersion = findXcodeVersion();
// XCode 11 produces warning about deprecation of 32-bit apps, but still works
const bool hasX86Mac = xcodeVersion < qbs::Version(12);
- const bool hasArmMac = false;
+ const bool hasArmMac = xcodeVersion >= qbs::Version(12, 2);
QDir::setCurrent(testDataDir + "/aggregateDependencyLinking");
QbsRunParameters params{QStringList{"-p", "multi_arch_lib"}};