1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testlib: Only consider major version for macOS 11 and later in blacklists

Browse Source 
Pick-to: 6.1 6.0 5.15
Change-Id: I9d3f7ca2022b17559dd5bdd5c6bb8c85e89c3f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Liang Qi 2021-02-03 11:24:14 +01:00
parent 0c5d9b953e
commit faab8f603d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/testlib/qtestblacklist.cpp
View File

@ -46,6 +46,7 @@
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/QSysInfo> #include <QtCore/QSysInfo>
#include <QtCore/QOperatingSystemVersion>
#include <set> #include <set>
@ -212,6 +213,9 @@ static QSet<QByteArray> activeConditions()
if (distributionName == "macos") { if (distributionName == "macos") {
if (result.find(distributionName) == result.end()) if (result.find(distributionName) == result.end())
result.insert("osx"); result.insert("osx");
const auto version = QOperatingSystemVersion::current();
if (version.majorVersion() >= 11)
distributionRelease = QByteArray::number(version.majorVersion());
} }
if (!distributionRelease.isEmpty()) { if (!distributionRelease.isEmpty()) {
QByteArray versioned = distributionName + "-" + distributionRelease; QByteArray versioned = distributionName + "-" + distributionRelease;