diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-04 12:57:51 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-24 05:01:57 +0000 |
| commit | 15ada2b91798638c90630c332e4a8caef7660638 (patch) | |
| tree | bac271959a1dc7050ae74ed1950bdfd476b4f723 /tests/auto/widgets/kernel/qboxlayout | |
| parent | c579f49e2a80a55a4004ff8e5b2ee76bda146387 (diff) | |
tests/auto/widgets/kernel: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: Icb32b516002c3bb2841c8e7a29624e54cfcbbcac
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qboxlayout')
| -rw-r--r-- | tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index 2f1a305710..8314dbedf5 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -226,15 +226,13 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing() window.show(); QVERIFY(QTest::qWaitForWindowExposed(&window)); - int spacing = pb2->geometry().left() - pb1->geometry().right() - 1; - QCOMPARE(spacing, 6); + auto spacing = [&]() { return pb2->geometry().left() - pb1->geometry().right() - 1; }; + QCOMPARE(spacing(), 6); QScopedPointer<CustomLayoutStyle> style2(new CustomLayoutStyle()); style2->hspacing = 10; window.setStyle(style2.data()); - QTest::qWait(100); - spacing = pb2->geometry().left() - pb1->geometry().right() - 1; - QCOMPARE(spacing, 10); + QTRY_COMPARE(spacing(), 10); } void tst_QBoxLayout::taskQTBUG_7103_minMaxWidthNotRespected() |