summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2014-01-13 14:56:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-06 07:38:24 +0200
commitfeca69e89f994e0353a86df224d20bde008ff6c2 (patch)
tree5a5218b9f59d5eb408a3830eb49d11cca4f14936
parentbf9970d40bf0c99a75b59674fa55bc859291d9ba (diff)
Revert "Ignore tst_QStyleSheetStyle::hoverColors() failures on Mac OS X"
This test doesn't fail on Mac any more. This reverts commit 36493a7a41b7ce38af429a943a73d791100c6c13. Task-number: QTBUG-23685 Change-Id: Ib7c56494b07de9839b3287758fe228f799bc343c Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 5a36ffc671..b22c573442 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -830,23 +830,14 @@ void tst_QStyleSheetStyle::hoverColors()
QTest::mouseMove ( widget, QPoint(6,6));
QTest::qWait(60);
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("", "Numerous failures related to Qt::WA_UnderMouse, see QTBUGT-23685", Continue);
-#endif
QVERIFY(widget->testAttribute(Qt::WA_UnderMouse));
QImage image(frame.width(), frame.height(), QImage::Format_ARGB32);
frame.render(&image);
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("", "Numerous failures related to Qt::WA_UnderMouse, see QTBUGT-23685", Continue);
-#endif
QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)),
(QString::fromLatin1(widget->metaObject()->className())
+ " did not contain background color #e8ff66").toLocal8Bit().constData());
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("", "Numerous failures related to Qt::WA_UnderMouse, see QTBUGT-23685", Continue);
-#endif
QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)),
(QString::fromLatin1(widget->metaObject()->className())
+ " did not contain text color #ff0084").toLocal8Bit().constData());