diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-23 16:59:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-23 16:59:48 +0000 |
| commit | bd452c3d25778dc646b8f0aff70fa6a8c7e0ebcc (patch) | |
| tree | 9266960d7017bb3dc9e29abe7e7337228f936387 /tests | |
| parent | 40b9fb8946837a01710814c28fd0f04edba631ad (diff) | |
| parent | 5931caca23709ed0b2583ca2fd268191d06a23ef (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'tests')
| -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 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() |