diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-05-14 14:51:46 +0200 |
| commit | 7e1b504f31dcdad0b055c1532209e44f81033bc9 (patch) | |
| tree | b7ab4b258a50af69179fa6efb4871c7218e475e1 /tests/auto/widgets/widgets | |
| parent | 432df3f8c8504b333ecc76df4ce19a7b2c04ae77 (diff) | |
| parent | 627de835b1b87280741eb96ae77ea42b1f6ef5dc (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
mkspecs/features/qt_module_headers.prf
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qwidget/BLACKLIST
Change-Id: I2a08952d28d1d0e3d73f521a3d44700ce79ff16c
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index c8a92f3751..ecad7267dd 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -1400,6 +1400,7 @@ void tst_QMdiArea::subWindowList() QMdiArea workspace; workspace.show(); qApp->setActiveWindow(&workspace); + QVERIFY(QTest::qWaitForWindowActive(&workspace)); QList<QMdiSubWindow *> activationOrder; QVector<QMdiSubWindow *> windows; @@ -1418,8 +1419,7 @@ void tst_QMdiArea::subWindowList() windows[staysOnTop1]->setWindowFlags(windows[staysOnTop1]->windowFlags() | Qt::WindowStaysOnTopHint); workspace.setActiveSubWindow(windows[activeSubWindow]); - qApp->processEvents(); - QCOMPARE(workspace.activeSubWindow(), windows[activeSubWindow]); + QTRY_COMPARE(workspace.activeSubWindow(), windows[activeSubWindow]); activationOrder.move(activationOrder.indexOf(windows[activeSubWindow]), windowCount - 1); QList<QMdiSubWindow *> subWindows = workspace.subWindowList(windowOrder); @@ -1441,13 +1441,11 @@ void tst_QMdiArea::subWindowList() windows[staysOnTop2]->setWindowFlags(windows[staysOnTop2]->windowFlags() | Qt::WindowStaysOnTopHint); workspace.setActiveSubWindow(windows[staysOnTop2]); - qApp->processEvents(); - QCOMPARE(workspace.activeSubWindow(), windows[staysOnTop2]); + QTRY_COMPARE(workspace.activeSubWindow(), windows[staysOnTop2]); activationOrder.move(activationOrder.indexOf(windows[staysOnTop2]), windowCount - 1); workspace.setActiveSubWindow(windows[activeSubWindow]); - qApp->processEvents(); - QCOMPARE(workspace.activeSubWindow(), windows[activeSubWindow]); + QTRY_COMPARE(workspace.activeSubWindow(), windows[activeSubWindow]); activationOrder.move(activationOrder.indexOf(windows[activeSubWindow]), windowCount - 1); QList<QMdiSubWindow *> widgets = workspace.subWindowList(windowOrder); |