diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:08:53 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-20 12:08:27 +0200 |
| commit | 5931caca23709ed0b2583ca2fd268191d06a23ef (patch) | |
| tree | 2519bd7dbce469e1ce185faaeb6bef481cade227 /tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | |
| parent | 7da45b21b76965e021e8a049715b1dee34081f7c (diff) | |
| parent | 2556b97ab22cfde606d2b77d6e816fd282741291 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
Diffstat (limited to 'tests/auto/quick/qquickwindow/tst_qquickwindow.cpp')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 93c3a34b39..dfe5276e8e 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1753,14 +1753,6 @@ void tst_qquickwindow::testWindowVisibilityOrder() QTest::qWaitForWindowExposed(window5); QVERIFY(window4->isVisible()); QVERIFY(window5->isVisible()); - window4->hide(); - window5->hide(); - - window3->hide(); - QTRY_COMPARE(window2, QGuiApplication::focusWindow()); - - window2->hide(); - QTRY_COMPARE(window1.data(), QGuiApplication::focusWindow()); } void tst_qquickwindow::blockClosing() |