From faab8f603d2cc34c072ffd0822af68dafcfd686a Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 3 Feb 2021 11:24:14 +0100
Subject: testlib: Only consider major version for macOS 11 and later in
 blacklists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/testlib/qtestblacklist.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/testlib')

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;
-- 
cgit v1.2.3