diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
| commit | 6f3e1896fa567bca8a9f3d35ea26cae518a9313e (patch) | |
| tree | 7475ec4153bece275efc1a97d5fa7420aa07a880 /tests/auto/blackbox/tst_blackbox.cpp | |
| parent | ec709675476e507ea094348091b0475084de976e (diff) | |
| parent | fa5e42f915211637da0d6461c9764962ee47f923 (diff) | |
Merge 1.12 into master
Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
Diffstat (limited to 'tests/auto/blackbox/tst_blackbox.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index ea8b9bd52..5dc858585 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1671,7 +1671,7 @@ void TestBlackbox::cxxLanguageVersion() QString mapKey; if (version == "c++17" && m_qbsStdout.contains("is even newer MSVC: true")) mapKey = "msvc-brandnew"; - if (m_qbsStdout.contains("is newer MSVC: true")) + else if (m_qbsStdout.contains("is newer MSVC: true")) mapKey = "msvc-new"; else if (m_qbsStdout.contains("is older MSVC: true")) mapKey = "msvc_old"; @@ -6212,7 +6212,7 @@ void TestBlackbox::minimumSystemVersion_data() const QString specific = []() -> QString { if (HostOsInfo::isMacosHost()) - return "__MAC_OS_X_VERSION_MIN_REQUIRED=1060\nversion 10.6\n"; + return "__MAC_OS_X_VERSION_MIN_REQUIRED=1070\nversion 10.7\n"; if (HostOsInfo::isWindowsHost()) return "WINVER=1536\n6.00 operating system version\n6.00 subsystem version\n"; @@ -6228,8 +6228,8 @@ void TestBlackbox::minimumSystemVersion_data() QTest::newRow("fakewindows") << "fakewindows" << "WINVER=1283\n5.03 operating system " "version\n5.03 subsystem version\n"; if (HostOsInfo::isMacosHost()) - QTest::newRow("macappstore") << "macappstore" << "__MAC_OS_X_VERSION_MIN_REQUIRED=1068\n" - "version 10.6"; + QTest::newRow("macappstore") << "macappstore" << "__MAC_OS_X_VERSION_MIN_REQUIRED=1071\n" + "version 10.7"; } void TestBlackbox::missingBuildGraph() |