summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-11-19 21:58:17 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2020-11-20 09:50:58 +0000
commitb572269a2b8910baf46d668f227bcb0ee247b8c4 (patch)
tree8c03b12f36f55256d6accce084b7b5014e32ace5
parent12bdba8068ab3b74763977e6b62f75dcce65b3af (diff)
downloadqbs-b572269a2b8910baf46d668f227bcb0ee247b8c4.tar.gz
macOS: Fix getNativeSetting() test on Big Sur
Change-Id: I585fe2646339a7d7454570638bef2ad5e9ab502a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/language/tst_language.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index a7037fa0f..4837d6000 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -1170,12 +1170,16 @@ void TestLanguage::getNativeSetting()
project = loader->loadProject(defaultParameters);
QString expectedTargetName;
- if (HostOsInfo::isMacosHost())
- expectedTargetName = QStringLiteral("Mac OS X");
- else if (HostOsInfo::isWindowsHost())
+ if (HostOsInfo::isMacosHost()) {
+ if (HostOsInfo::hostOsVersion() >= qbs::Version(11))
+ expectedTargetName = QStringLiteral("macOS");
+ else
+ expectedTargetName = QStringLiteral("Mac OS X");
+ } else if (HostOsInfo::isWindowsHost()) {
expectedTargetName = QStringLiteral("Windows");
- else
+ } else {
expectedTargetName = QStringLiteral("Unix");
+ }
QVERIFY(!!project);
QHash<QString, ResolvedProductPtr> products;