diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-06 16:25:21 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-25 11:55:34 +0000 |
| commit | 0cb940b1d3b9a1ba50f2d1973fca411706da266d (patch) | |
| tree | 326e6a32edef67c9e4000862a47fa49db2dd8263 /tests/auto/widgets/widgets/qabstractscrollarea | |
| parent | 7917305aa5acdad117632bc2723d9bec85daa0e0 (diff) | |
tests/auto/widgets/widgets: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: I7b0c259800082284ddae4e25d139ad3adc858467
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qabstractscrollarea')
| -rw-r--r-- | tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp index 60efcddc60..372a467ada 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -346,6 +346,7 @@ void tst_QAbstractScrollArea::patternBackground() widget.resize(600, 600); scrollArea.setWidget(&widget); topLevel.show(); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); QLinearGradient linearGrad(QPointF(250, 250), QPointF(300, 300)); linearGrad.setColorAt(0, Qt::yellow); @@ -354,7 +355,6 @@ void tst_QAbstractScrollArea::patternBackground() scrollArea.viewport()->setPalette(QPalette(Qt::black, bg, bg, bg, bg, bg, bg, bg, bg)); widget.setPalette(Qt::transparent); - QTest::qWait(50); QImage image(200, 200, QImage::Format_ARGB32); scrollArea.render(&image); @@ -366,7 +366,6 @@ void tst_QAbstractScrollArea::patternBackground() QScrollBar *vbar = scrollArea.verticalScrollBar(); vbar->setValue(vbar->maximum()); - QTest::qWait(50); scrollArea.render(&image); QCOMPARE(image.pixel(QPoint(20,20)) , QColor(Qt::red).rgb()); |