summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview/qgraphicsitem
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-11-23 20:29:48 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-11-27 19:11:25 +0100
commite70fe301d919d059ad982574660149a1233a9649 (patch)
tree6ca3736131d0344dccad54ca0977ce668984a3f8 /tests/auto/widgets/graphicsview/qgraphicsitem
parent64760504e79c3069d99b5e852688a2589ec22028 (diff)
Widget autotests: replace deprecated QWidget::repaint() calls
Replace QWidget::repaint() with update() + wait until the paint event is received. Task-number: QTBUG-80237 Change-Id: I57da7cd8fa119344484b849a88729bca7b48616c Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsitem')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 35037eb323..262e1772a0 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -8297,20 +8297,14 @@ void tst_QGraphicsItem::sorting()
_paintedItems.clear();
- view.viewport()->repaint();
-#if defined(Q_OS_MAC)
- // There's no difference between repaint and update on the Mac,
- // so we have to process events here to make sure we get the event.
- QTest::qWait(100);
-#endif
-
+ view.viewport()->update();
const GraphicsItems expected{grid[0][0], grid[0][1], grid[0][2], grid[0][3],
grid[1][0], grid[1][1], grid[1][2], grid[1][3],
grid[2][0], grid[2][1], grid[2][2], grid[2][3],
grid[3][0], grid[3][1], grid[3][2], grid[3][3],
grid[4][0], grid[4][1], grid[4][2], grid[4][3],
item1, item2};
- QCOMPARE(_paintedItems, expected);
+ QTRY_COMPARE(_paintedItems, expected);
}
void tst_QGraphicsItem::itemHasNoContents()
@@ -8337,13 +8331,7 @@ void tst_QGraphicsItem::itemHasNoContents()
_paintedItems.clear();
- view.viewport()->repaint();
-#ifdef Q_OS_MAC
- // There's no difference between update() and repaint() on the Mac,
- // so we have to process events here to make sure we get the event.
- QTest::qWait(10);
-#endif
-
+ view.viewport()->update();
QTRY_COMPARE(_paintedItems, GraphicsItems{item2});
}