diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-26 09:17:22 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-26 09:17:22 +0200 |
| commit | fe9e48d1d939a2bf98a110be5efccc55ebdcbd4f (patch) | |
| tree | 7263fe4b349be72f974213259f63f7c60f20f0ae /tests | |
| parent | 5d1e992f95208831ccbdf01055f19537fb1f8ba0 (diff) | |
| parent | 7a96709f4566135ae3d5880d509c238e12e3d241 (diff) | |
Merge 1.13 into master
Change-Id: Ife9f7cd99dd5a531bcb670b2dfbd245471a8c379
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 399a49b21..21f19c8a2 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6475,10 +6475,13 @@ void TestBlackbox::minimumSystemVersion_data() const QString unspecified = []() -> QString { if (HostOsInfo::isMacosHost()) { const auto v = defaultClangMinimumDeploymentTarget(); - return "__MAC_OS_X_VERSION_MIN_REQUIRED=" - + QString::number(toMinimumDeploymentTargetValue(v, true)) - + "\nversion " + auto result = "__MAC_OS_X_VERSION_MIN_REQUIRED=" + + QString::number(toMinimumDeploymentTargetValue(v, true)); + if (v < qbs::Version(10, 14)) { + result += "\nversion " + QString::number(v.majorVersion()) + "." + QString::number(v.minorVersion()); + } + return result; } if (HostOsInfo::isWindowsHost()) |