diff options
| author | Alan Alpert <416365416c@gmail.com> | 2015-03-30 18:06:44 -0700 |
|---|---|---|
| committer | Alan Alpert <aalpert@blackberry.com> | 2015-06-02 21:11:18 +0000 |
| commit | 2c860b9c4de8a1f423a1a6c10a3460552e959d95 (patch) | |
| tree | b94c8351f1ce86614a01ec97cacbac9e7c7a90aa | |
| parent | 72c042fa3e23fa1aa4579df801e3cd4411d80bbd (diff) | |
Remove testing of active window change on hide
We don't actually control where the window manager
assigns focus if the currently active window is hidden,
so don't test for specific behavior.
We can now remove the blacklist entry for this test.
Change-Id: Ie09fc91c6317f6bb2d4b91000641ef241556fddf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| -rw-r--r-- | tests/auto/quick/qquickwindow/BLACKLIST | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST deleted file mode 100644 index 1201ef12f0..0000000000 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[testWindowVisibilityOrder] -osx diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 7c94cf6d17..f638505c72 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1716,14 +1716,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(), true); - - window2->hide(); - QTRY_COMPARE(window1 == QGuiApplication::focusWindow(), true); } void tst_qquickwindow::blockClosing() |