diff options
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
-rw-r--r-- | src/testlib/qtestblacklist.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 1cf2ee09e3..cd115bdcae 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -36,6 +36,7 @@ #include <QtTest/qtestcase.h> #include <QtCore/qbytearray.h> #include <QtCore/qfile.h> +#include <QtCore/QSysInfo> #include <set> @@ -121,6 +122,14 @@ static bool checkCondition(const QByteArray &condition) ++m; } + QByteArray distributionName = QSysInfo::productType().toLower().toUtf8(); + QByteArray distributionRelease = QSysInfo::productVersion().toLower().toUtf8(); + if (!distributionName.isEmpty()) { + if (matches.find(distributionName) == matches.end()) + matches.insert(distributionName); + matches.insert(distributionName + "-" + distributionRelease); + } + for (int i = 0; i < conds.size(); ++i) { QByteArray c = conds.at(i); bool result = c.startsWith('!'); |