diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-24 21:12:28 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-25 14:12:58 +0000 |
| commit | 7a96709f4566135ae3d5880d509c238e12e3d241 (patch) | |
| tree | e76643a2a99bba16f63dd51e35c9f8a201014ac8 /tests | |
| parent | f7844c762273d08f113e24e9d4a5c20fa42baa64 (diff) | |
Do not check for minimumMacosVersion when not specified
Since macOS 10.14, the LC_VERSION_MIN_MACOSX is not inserted into binary when compiling for the current macOS
Change-Id: Id5fce8fecc656916d3b1c2cb9f07716b6c86a07a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
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 bc187b210..27a12eff7 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6470,10 +6470,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()) |