diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 18:47:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-01 09:10:26 +0200 |
commit | 0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch) | |
tree | 6060e002af2900007895f6efa757989dd4c190c9 /src/testlib/qtestblacklist.cpp | |
parent | 418869d9158ea5cd998ba30778b0b7173b48161b (diff) | |
parent | 17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/testlib/qtestblacklist.cpp
src/widgets/accessible/qaccessiblewidgets.cpp
Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
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 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('!'); |