From 93055e81c83c02b88630ee6f5bb243ab42b2fad6 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Tue, 17 Apr 2012 07:29:24 +0200 Subject: [PATCH] Move XFAIL in tst_QGraphicsProxyWidget on Mac OS X The number of paint events is correct now, but the first expected region is still incorrect. Move the XFAIL to the region comparison. Change-Id: I3e706cf703b20a0e98b644b3082172fc3142b44f Reviewed-by: Rohan McGovern Reviewed-by: Jason McDonald --- .../qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index fef21c19f7..fc1126989d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3376,11 +3376,10 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-23700", Abort); -#endif - QTRY_COMPARE(view.npaints, 1); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-23700", Continue); +#endif QCOMPARE(view.paintEventRegion, expectedRegion); proxy->show();