diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-25 15:03:03 +0200 |
| commit | 3e20d1059a612ba5a6d3c049fe93f780f3ba3e58 (patch) | |
| tree | ee20524e6bf4cfb41ea5b3bf867bc546abf9edd9 /tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | |
| parent | 1aa91f8b0b140c417c6e97dfd22fa498d31bceb6 (diff) | |
| parent | 2416b9d6cc2950395151c18a7f7bfceb4b7fc693 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Change-Id: Ie5d0b2d9bece98553262f8af1ce66459f03a73e1
Diffstat (limited to 'tests/auto/quick/qquickwindow/tst_qquickwindow.cpp')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 2d03849981..c95d9b311e 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1936,10 +1936,15 @@ void tst_qquickwindow::testWindowVisibilityOrder() QWindowList windows = QGuiApplication::topLevelWindows(); QTRY_COMPARE(windows.size(), 5); - QCOMPARE(window3, QGuiApplication::focusWindow()); - QVERIFY(window1->isActive()); - QVERIFY(window2->isActive()); - QVERIFY(window3->isActive()); + if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity" && QGuiApplication::focusWindow() != window3) { + qDebug() << "Unity (flaky QTBUG-62604): expected window3 to have focus; actual focusWindow:" + << QGuiApplication::focusWindow(); + } else { + QCOMPARE(window3, QGuiApplication::focusWindow()); + QVERIFY(window1->isActive()); + QVERIFY(window2->isActive()); + QVERIFY(window3->isActive()); + } //Test if window4 is shown 2 seconds after the application startup //with window4 visible window5 (transient child) should also become visible |