summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2018-04-10 15:43:07 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2018-05-14 06:05:19 +0000
commit627de835b1b87280741eb96ae77ea42b1f6ef5dc (patch)
treed55cef198789ceedf6cd5c6c6307380774ea8c75 /tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
parent69e0393399e4aba077f29b36611670dbe5813e27 (diff)
tests/auto/widgets/graphicsview: Avoid unconditional qWait()s
Task-number: QTBUG-63992 Change-Id: Ibbcf5bf968fcf1b1c3a043c805bdcc23a4005f00 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 97f3eb4a60..f9b6fe3ebd 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -612,7 +612,6 @@ void tst_QGraphicsLinearLayout::insertStretch()
}
}
- //QTest::qWait(1000);
delete widget;
}
@@ -639,7 +638,6 @@ void tst_QGraphicsLinearLayout::invalidate()
layout.setContentsMargins(0, 0, 0, 0);
view.show();
widget->show();
- //QTest::qWait(1000);
QVERIFY(QTest::qWaitForWindowExposed(&view));
qApp->processEvents();
layout.layoutRequest = 0;
@@ -1218,7 +1216,6 @@ void tst_QGraphicsLinearLayout::testStretch()
//view->setSceneRect(-50, -50, 800, 800);
//view->show();
//QVERIFY(QTest::qWaitForWindowExposed(view));
- //QTest::qWait(5000);
QCOMPARE(form->geometry().size(), QSizeF(600,600));
QCOMPARE(w1->geometry(), QRectF(0, 0, 100, 100));
QCOMPARE(w2->geometry(), QRectF(400, 0, 200, 200));
@@ -1521,7 +1518,7 @@ void tst_QGraphicsLinearLayout::removeLayout()
QGraphicsView view(&scene);
view.show();
- QTest::qWait(20);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QRectF r1 = textEdit->geometry();
QRectF r2 = pushButton->geometry();