summaryrefslogtreecommitdiffstats
path: root/tests/auto/macnativeevents
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-08-17 15:30:34 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2010-08-17 15:35:09 (GMT)
commit569b28760ba84a2cc5315bf06c173035dc14afc6 (patch)
treebd39252b8888ecb4933909bb084edf38f924dfa0 /tests/auto/macnativeevents
parentdb41f54d5cfe9e1cfa13c78536718ca34f008284 (diff)
downloadQt-569b28760ba84a2cc5315bf06c173035dc14afc6.zip
Qt-569b28760ba84a2cc5315bf06c173035dc14afc6.tar.gz
Qt-569b28760ba84a2cc5315bf06c173035dc14afc6.tar.bz2
Cocoa, Autotest: disable autotest that was added a bit premature
The test is actually correct, but cannot be enabled before a second revision on the setStackingOrder function in qwidget_mac.mm has been rewritten to handle inter-child window stacking order Reviewed-by: prasanth
Diffstat (limited to 'tests/auto/macnativeevents')
-rw-r--r--tests/auto/macnativeevents/tst_macnativeevents.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index ac7d661..d582417 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -69,7 +69,7 @@ private slots:
void testChildDialogInFrontOfModalParent();
#ifdef QT_MAC_USE_COCOA
void testChildWindowInFrontOfParentWindow();
- void testChildToolWindowInFrontOfChildNormalWindow();
+// void testChildToolWindowInFrontOfChildNormalWindow();
void testChildWindowInFrontOfStaysOnTopParentWindow();
#endif
void testKeyPressOnToplevel();
@@ -339,6 +339,7 @@ void tst_MacNativeEvents::testChildWindowInFrontOfParentWindow()
QVERIFY(!child.isVisible());
}
+/* This test can be enabled once setStackingOrder has been fixed in qwidget_mac.mm
void tst_MacNativeEvents::testChildToolWindowInFrontOfChildNormalWindow()
{
// Test that a child tool window always stacks in front of normal sibling windows.
@@ -365,7 +366,7 @@ void tst_MacNativeEvents::testChildToolWindowInFrontOfChildNormalWindow()
QTest::qWait(100);
QVERIFY(!toolChild.isVisible());
}
-
+*/
void tst_MacNativeEvents::testChildWindowInFrontOfStaysOnTopParentWindow()
{
// Test that a child window stacks on top of a stays-on-top parent.