diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-06-05 12:25:04 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-06-06 06:30:35 +0000 |
commit | eb655b7a1a0d4c8578b24fef490e72769cff0a65 (patch) | |
tree | 08ef0e7776f3b88d8356fd72058d0ca012d471bd /tests | |
parent | b625a01a380934e870adb3c3d33a15b761c575d2 (diff) |
Skip tst_QWindow::modalDialogClosingOneOfTwoModal without activation
The test doesn't make much sense on platforms that don't support window
activation.
Task-number: QTBUG-66849
Change-Id: I875314d026d666173ec345d0864ad41d66179783
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index d840389b02..85693d7bdd 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -1915,8 +1915,8 @@ void tst_QWindow::modalDialog() void tst_QWindow::modalDialogClosingOneOfTwoModal() { - if (isPlatformWayland()) - QSKIP("Wayland: This fails. Figure out why."); + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("QWindow::requestActivate() is not supported."); QWindow normalWindow; normalWindow.setFramePosition(m_availableTopLeft + QPoint(80, 80)); |