diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 2b143c5d98..5ae5e20e80 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1498,9 +1498,6 @@ void tst_QGraphicsProxyWidget::scrollUpdate() // QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2) // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2), // intersected with the above update. -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-24294", Abort); -#endif QCOMPARE(view.paintEventRegion.rects(), QVector<QRect>() << QRect(0, 0, 200, 12) << QRect(0, 12, 102, 10)); QCOMPARE(widget->npaints, 2); @@ -2475,9 +2472,6 @@ void tst_QGraphicsProxyWidget::popup_basic() QTest::mousePress(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center()))); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-24294", Abort); -#endif QTRY_COMPARE(box->pos(), QPoint()); QCOMPARE(proxy->childItems().count(), 1); @@ -3363,6 +3357,9 @@ void tst_QGraphicsProxyWidget::comboboxWindowFlags() void tst_QGraphicsProxyWidget::updateAndDelete() { +#ifdef Q_OS_MAC + QSKIP("Test case unstable on this platform, QTBUG-23700"); +#endif QGraphicsScene scene; QGraphicsProxyWidget *proxy = scene.addWidget(new QPushButton("Hello World")); View view(&scene); @@ -3371,6 +3368,8 @@ void tst_QGraphicsProxyWidget::updateAndDelete() qt_x11_wait_for_window_manager(&view); #endif QTRY_VERIFY(view.npaints > 0); + // Wait a bit to clear all pending paint events + QTest::qWait(10); const QRect itemDeviceBoundingRect = proxy->deviceTransform(view.viewportTransform()) .mapRect(proxy->boundingRect()).toRect(); @@ -3382,13 +3381,7 @@ void tst_QGraphicsProxyWidget::updateAndDelete() // Update and hide. proxy->update(); proxy->hide(); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-24294", Abort); -#endif QTRY_COMPARE(view.npaints, 1); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-23700", Continue); -#endif QCOMPARE(view.paintEventRegion, expectedRegion); proxy->show(); |