diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:44:20 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-01-16 11:48:55 +0100 |
| commit | e2a546a18be88f380b3d9d3efbed390fe1a9e93f (patch) | |
| tree | f7a6a0c7a60ee7b771ee9d6256c385f761113135 /tests/auto/gui/kernel/qwindow | |
| parent | 0be8f59d725d4a5e79709487e3aac1d351a6c04c (diff) | |
| parent | 99b89d30fa5484c5d1f3cbda828648c28af4fb7d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I896b0cf54f317c4336cc3d3db319a0b89e421728
Diffstat (limited to 'tests/auto/gui/kernel/qwindow')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 3e03d9e236..9108cf2c1f 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -15,6 +15,7 @@ ubuntu-14.04 [modalWindowEnterEventOnHide_QTBUG35109] ubuntu-14.04 ubuntu-16.04 +osx 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 039d095ce6..f1c4f970cd 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -2029,9 +2029,6 @@ void tst_QWindow::modalWindowPosition() #ifndef QT_NO_CURSOR void tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109() { - if (QGuiApplication::platformName() == QLatin1String("cocoa")) - QSKIP("This test fails on OS X on CI"); - if (isPlatformOffscreenOrMinimal()) QSKIP("Can't test window focusing on offscreen/minimal"); |