diff options
| author | Liang Qi <liang.qi@qt.io> | 2021-02-03 11:24:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2021-02-04 19:17:49 +0100 |
| commit | b3a457d66a63fbe3443dfd5993c1ffe6ebaa09e0 (patch) | |
| tree | 3fedb712ca1b9aed4cfb51c688b1a8509db79aea | |
| parent | 8e3cbe2e5a468b3bc0cb3f1db7cd0e8c0254e59f (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: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index ce60168a06..d0b40d59b1 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> @@ -208,6 +209,11 @@ static QSet<QByteArray> activeConditions() if (!distributionName.isEmpty()) { if (result.find(distributionName) == result.end()) result.insert(distributionName); + if (distributionName == "macos" || distributionName == "osx") { + const auto version = QOperatingSystemVersion::current(); + if (version.majorVersion() >= 11) + distributionRelease = QByteArray::number(version.majorVersion()); + } if (!distributionRelease.isEmpty()) { QByteArray versioned = distributionName + "-" + distributionRelease; if (result.find(versioned) == result.end()) |