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/widgets/qtabwidget/tst_qtabwidget.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/widgets/qtabwidget/tst_qtabwidget.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index b5ffb90e42..cd7fe3710d 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -549,8 +549,7 @@ void tst_QTabWidget::paintEventCount() QCOMPARE(tw->currentIndex(), 0); tw->show(); - - QTest::qWait(1000); + QVERIFY(QTest::qWaitForWindowActive(tw)); // Mac, Windows and Windows CE get multiple repaints on the first show, so use those as a starting point. static const int MaxInitialPaintCount = |