From feca69e89f994e0353a86df224d20bde008ff6c2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 13 Jan 2014 14:56:31 +0100 Subject: 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 Reviewed-by: Friedemann Kleint --- .../widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'tests/auto') 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()); -- cgit v1.2.3