diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-05 13:15:31 +0100 |
| commit | 954fe2c35d0b0435b7f0443d917a5145dfd0c2a4 (patch) | |
| tree | 13d2d5c76823fa2a3664f2a06219cd1fcc26f7a4 /tests/auto/gui/kernel | |
| parent | 70057dfc0e53b7996acd5ef2c0f9c40aa3f66062 (diff) | |
| parent | 681933c5b8656543c4974a1db5fde093f2934189 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ifce6ddeb4dab8c672732ec6aa6c19a6c4bce447e
Diffstat (limited to 'tests/auto/gui/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 5e44747190..5c20e5fd43 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -11,6 +11,7 @@ ubuntu-16.04 [modalWindowEnterEventOnHide_QTBUG35109] ubuntu-16.04 osx ci +windows ci [modalDialogClosingOneOfTwoModal] osx [modalWindowModallity] diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 67bdf35a3a..a7cf4fe35a 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -1729,9 +1729,6 @@ void tst_QWindow::tabletEvents() void tst_QWindow::windowModality_QTBUG27039() { - if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive)) - QSKIP("Wayland: This fails. Figure out why."); - QWindow parent; parent.setGeometry(QRect(m_availableTopLeft + QPoint(10, 10), m_testWindowSize)); parent.show(); @@ -2369,7 +2366,7 @@ void tst_QWindow::generatedMouseMove() w.setGeometry(QRect(m_availableTopLeft + QPoint(100, 100), m_testWindowSize)); w.setFlags(w.flags() | Qt::FramelessWindowHint); // ### FIXME: QTBUG-63542 w.show(); - QVERIFY(QTest::qWaitForWindowActive(&w)); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QPoint point(10, 10); QPoint step(2, 2); |