From ba4c9f7ba7dd1cbbf59916d22d7c7fc4fe430a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 10 Oct 2012 18:08:00 +0200 Subject: Build fix after QVariant change. QVariant(Qt::GlobalColor) was removed in Qt5. Change-Id: I08b89fc6799e3645755dd435cc8b861fafd9fd05 Reviewed-by: Olivier Goffart Reviewed-by: Stephen Kelly --- tests/auto/xmlpatternssdk/TestGroup.cpp | 4 ++-- tests/auto/xmlpatternssdk/XQTSTestCase.cpp | 8 ++++---- tests/auto/xmlpatternssdk/XSDTSTestCase.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tests') 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(); } -- cgit v1.2.1