diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2012-10-10 18:08:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 18:34:39 +0200 |
| commit | ba4c9f7ba7dd1cbbf59916d22d7c7fc4fe430a4f (patch) | |
| tree | c14c8c29565d13197aa1882f68ac7417d497df4f | |
| parent | 79893572a1cd2a7a880dbb3b820006187a992921 (diff) | |
| download | qtxmlpatterns-ba4c9f7ba7dd1cbbf59916d22d7c7fc4fe430a4f.tar.gz | |
Build fix after QVariant change.
QVariant(Qt::GlobalColor) was removed in Qt5.
Change-Id: I08b89fc6799e3645755dd435cc8b861fafd9fd05
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | tests/auto/xmlpatternssdk/TestGroup.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/xmlpatternssdk/XQTSTestCase.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/xmlpatternssdk/XSDTSTestCase.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/xmlpatternssdk/TestGroup.cpp b/tests/auto/xmlpatternssdk/TestGroup.cpp index 9f59193..3b4eea9 100644 --- a/tests/auto/xmlpatternssdk/TestGroup.cpp +++ b/tests/auto/xmlpatternssdk/TestGroup.cpp @@ -94,7 +94,7 @@ QVariant TestGroup::data(const Qt::ItemDataRole role, int column) const if(sum.first) { /* Pass. */ - return Qt::green; + return QColor(Qt::green); } else return QVariant(); @@ -104,7 +104,7 @@ QVariant TestGroup::data(const Qt::ItemDataRole role, int column) const if(failures) { /* Failure. */ - return Qt::red; + return QColor(Qt::red); } else return QVariant(); diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.cpp b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp index 4e2a7bf..10d97a3 100644 --- a/tests/auto/xmlpatternssdk/XQTSTestCase.cpp +++ b/tests/auto/xmlpatternssdk/XQTSTestCase.cpp @@ -102,7 +102,7 @@ QVariant XQTSTestCase::data(const Qt::ItemDataRole role, int column) const if(!tr) { if(column == 0) - return Qt::yellow; + return QColor(Qt::yellow); else return QVariant(); } @@ -110,14 +110,14 @@ QVariant XQTSTestCase::data(const Qt::ItemDataRole role, int column) const const TestResult::Status status = tr->status(); if(status == TestResult::NotTested || status == TestResult::Unknown) - return Qt::yellow; + return QColor(Qt::yellow); switch(column) { case 1: - return status == TestResult::Pass ? Qt::green : QVariant(); + return status == TestResult::Pass ? QColor(Qt::green) : QVariant(); case 2: - return status == TestResult::Fail ? Qt::red : QVariant(); + return status == TestResult::Fail ? QColor(Qt::red) : QVariant(); default: return QVariant(); } diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp index 3c54874..8f55a16 100644 --- a/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp +++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.cpp @@ -192,7 +192,7 @@ QVariant XSDTSTestCase::data(const Qt::ItemDataRole role, int column) const if(!tr) { if(column == 0) - return Qt::yellow; + return QColor(Qt::yellow); else return QVariant(); } @@ -200,14 +200,14 @@ QVariant XSDTSTestCase::data(const Qt::ItemDataRole role, int column) const const TestResult::Status status = tr->status(); if(status == TestResult::NotTested || status == TestResult::Unknown) - return Qt::yellow; + return QColor(Qt::yellow); switch(column) { case 1: - return status == TestResult::Pass ? Qt::green : QVariant(); + return status == TestResult::Pass ? QColor(Qt::green) : QVariant(); case 2: - return status == TestResult::Fail ? Qt::red : QVariant(); + return status == TestResult::Fail ? QColor(Qt::red) : QVariant(); default: return QVariant(); } |