From 619fbc129d73e5107f870211d7aecb2571aef007 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 18 Jan 2012 08:30:53 +0100 Subject: Fix XPASS in tst_QGraphicsWidget on Mac OS X Don't expect failure from these 2 tests anymore: XPASS : tst_QGraphicsWidget::initStyleOption(all) COMPARE() Loc: [tst_qgraphicswidget.cpp(1162)] XPASS : tst_QGraphicsWidget::initialShow2() COMPARE() Loc: [tst_qgraphicswidget.cpp(3196)] Change-Id: Ibd1178f8cab480fa9fad9c829083a4862749c60b Reviewed-by: Jason McDonald --- .../auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp') diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index ccc12624dd..0e843324b0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1157,7 +1157,7 @@ void tst_QGraphicsWidget::initStyleOption() bool hasFocus = option.state & QStyle::State_HasFocus; QCOMPARE(hasFocus, focus); bool isUnderMouse = option.state & QStyle::State_MouseOver; -#ifndef Q_OS_WINCE +#if !defined(Q_OS_WINCE) && !defined(Q_OS_MAC) QEXPECT_FAIL("all", "QTBUG-22457", Abort); QCOMPARE(isUnderMouse, underMouse); #endif @@ -3192,7 +3192,9 @@ void tst_QGraphicsWidget::initialShow2() view.show(); QTest::qWaitForWindowShown(&view); +#ifndef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-20778", Abort); +#endif QTRY_COMPARE(widget->repaints, expectedRepaintCount); } -- cgit v1.2.3