summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-03-14 15:50:35 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-03-15 13:51:41 +0000
commit5e18f4ce0b16e9ff3101493d603bbc51b93dd2cb (patch)
tree61043f33f2fd7bdf4f213827e94c4b78a5dd9d2a
parent7ac100ddd1d5e8d2f5d111f793f41ed6c98179ca (diff)
Skip tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
Closing the dialog at the end of the test ends the modal session via QCocoaEventDispatcherPrivate::endModalSession(), but the actual ending of the session is deferred to cleanupModalSessions(), and that is never called. The result is that QCocoaWindow::setVisible of the window in testKeyPressOnToplevel and following tests ends up calling [m_nsWindow orderFront:nil]; instead of [m_nsWindow makeKeyAndOrderFront:nil];, leaving the window inactive and the tests failing. Task-number: QTBUG-58474 Change-Id: If66b2e201f658b627c2ec50a562938f59a5037ed Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--tests/auto/other/macnativeevents/tst_macnativeevents.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
index 1624b3065b..5edff7aabe 100644
--- a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
@@ -280,6 +280,8 @@ void tst_MacNativeEvents::testMouseEnter()
void tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
{
+ QSKIP("Modal dialog causes later tests to fail, see QTBUG-58474");
+
// Test that a child dialog of a modal parent dialog is
// in front of the parent, and active:
QDialog parent;