diff options
| author | Liang Qi <liang.qi@qt.io> | 2021-02-03 11:24:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-03 21:27:47 +0000 |
| commit | cecf21997b045a89c8c0865d917491f6500a8089 (patch) | |
| tree | 23bc0d3427affcf4e0fddba5696c63860dae882d /src/testlib | |
| parent | 7a0f2cafaf65826c696eb736ddb5c1067d09ead2 (diff) | |
testlib: Only consider major version for macOS 11 and later in blacklists
Change-Id: I9d3f7ca2022b17559dd5bdd5c6bb8c85e89c3f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit faab8f603d2cc34c072ffd0822af68dafcfd686a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 78eba7b8be..d220e9f6eb 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -46,6 +46,7 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qvariant.h> #include <QtCore/QSysInfo> +#include <QtCore/QOperatingSystemVersion> #include <set> @@ -212,6 +213,9 @@ static QSet<QByteArray> activeConditions() if (distributionName == "macos") { if (result.find(distributionName) == result.end()) result.insert("osx"); + const auto version = QOperatingSystemVersion::current(); + if (version.majorVersion() >= 11) + distributionRelease = QByteArray::number(version.majorVersion()); } if (!distributionRelease.isEmpty()) { QByteArray versioned = distributionName + "-" + distributionRelease; |