From: Bradley T. Hughes <bradley.hughes@nokia.com>
Date: Wed, 18 Jan 2012 07:30:53 +0000 (+0100)
Subject: Fix XPASS in tst_QGraphicsWidget on Mac OS X
X-Git-Tag: qt-v5.0.0-alpha1~1666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=619fbc129d73e5107f870211d7aecb2571aef007;p=profile%2Fivi%2Fqtbase.git

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 <jason.mcdonald@nokia.com>
---

diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index ccc1262..0e84332 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);
 }