1 files changed, 9 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index bf795fcd68..52a9977bbf 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -39,6 +39,7 @@
 #include <QtCore/qset.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/QSysInfo>
 
 #include <set>
 
@@ -128,6 +129,14 @@ static bool checkCondition(const QByteArray &condition)
     static QSet<QByteArray> matchedConditions = keywords();
     QList<QByteArray> conds = condition.split(' ');
 
+    QByteArray distributionName = QSysInfo::productType().toLower().toUtf8();
+    QByteArray distributionRelease = QSysInfo::productVersion().toLower().toUtf8();
+    if (!distributionName.isEmpty()) {
+        if (matchedConditions.find(distributionName) == matchedConditions.end())
+            matchedConditions.insert(distributionName);
+        matchedConditions.insert(distributionName + "-" + distributionRelease);
+    }
+
     for (int i = 0; i < conds.size(); ++i) {
         QByteArray c = conds.at(i);
         bool result = c.startsWith('!');