summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-01-17 14:36:07 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-23 14:47:10 +0100
commit1196b70cf25762f7c8c278d31ae814e776503bd3 (patch)
tree43030702d4a41c866cec651c344d8ac8277ee513 /tests/auto
parent36493a7a41b7ce38af429a943a73d791100c6c13 (diff)
Ignore known tst_QStyleSheetStyle failures on Mac OS X
Task-number: QTBUG-23686 Change-Id: I566f3b3491576325389862bac2ad7c8526dd930b Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 6466fce1bf..f15f60830b 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -781,6 +781,10 @@ void tst_QStyleSheetStyle::focusColors()
+ " did not contain background color #e8ff66, using style "
+ QString::fromLatin1(qApp->style()->metaObject()->className()))
.toLocal8Bit().constData());
+#ifdef Q_OS_MAC
+ if (widget == widgets.first())
+ QEXPECT_FAIL("", "Failure only for first widget, the QPushButton, see QTBUG-23686", Continue);
+#endif
QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)),
(QString::fromLatin1(widget->metaObject()->className())
+ " did not contain text color #ff0084, using style "
@@ -1036,7 +1040,13 @@ void tst_QStyleSheetStyle::minmaxSizes()
QVERIFY(qAbs(page3->minimumSize().height() - 250 - 2) <= 2);
QTabBar *bar = qFindChild<QTabBar*>(&tabWidget);
QVERIFY(bar);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-23686", Continue);
+#endif
QVERIFY(qAbs(bar->tabRect(index1).width() - 100 - 2) <= 2);
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-23686", Continue);
+#endif
QVERIFY(qAbs(bar->tabRect(index3).width() - 130 - 2) <= 2);
}