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/qgridlayout/tst_qgridlayout.cpp | |
| 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/qgridlayout/tst_qgridlayout.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 40a2319910..5e0327319b 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -1441,7 +1441,6 @@ void tst_QGridLayout::layoutSpacing() QLayout *layout = widget->layout(); QVERIFY(layout); - //QTest::qWait(2000); for (int pi = 0; pi < expectedpositions.count(); ++pi) { QLayoutItem *item = layout->itemAt(pi); //qDebug() << item->widget()->pos(); |