diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 09:55:10 +0200 |
| commit | 866b47916dfcf2823b8fc4df719f1ebf15acef70 (patch) | |
| tree | a4eef09d00d407dec26b99b9f094bf1f5093dcb8 /tests/auto/widgets/kernel/qboxlayout | |
| parent | a9fc91466c2c143bea422d98af24755f43c2b97b (diff) | |
| parent | 4bab1b0d7c2462ee9c5369c949b45bc4dedc1194 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: Ideea96d1b43d47b1d9b34e11c9986a88e240aa71
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 3dfb9c35b3..b2650d1f32 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -227,15 +227,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() |