1 files changed, 14 insertions, 8 deletions
diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
index b0b8c8b..deb6c8d 100644
--- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
+++ b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -833,9 +833,14 @@ void tst_accessibility_mac::testTabWidget()
     // Window is not reported properly on 10.5
     if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5) {
         QVERIFY(equal(window(tabGroup), form));
-        QVERIFY(equal(window(tabButton1), form));
+
+    //   ### hangs on 10.4
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+    QVERIFY(equal(window(tabButton1), form));
+#endif
     }
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
+//   ### hangs on 10.4
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
     QVERIFY(equal(topLevelUIElement(tabGroup), form));
     QVERIFY(equal(topLevelUIElement(tabButton1), form));    
 #endif
@@ -1423,7 +1428,6 @@ void tst_accessibility_mac::testListView()
     const AXUIElementRef listElement = childByRole(scrollAreaElement, "AXList");
     QVERIFY(listElement);
     QVERIFY(equal(::parent(listElement), scrollAreaElement));
-
     // Window is not reported properly on 10.5
     if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5) 
         QVERIFY(equal(::window(listElement), windowElement));
@@ -1438,9 +1442,11 @@ void tst_accessibility_mac::testListView()
     QVERIFY(value(A) == "A");
     QVERIFY(equal(::parent(A), listElement));
     QVERIFY(enabled(A));
-    // Window is not reported properly on 10.5
-    if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5) 
-        QVERIFY(equal(::window(A), windowElement));
+
+    // Window is not reported properly on 10.5, this test
+    // hangs on 10.4. Disable it for now.
+    //    if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5) 
+    //        QVERIFY(equal(::window(A), windowElement));
     
     QVERIFY(above(A, B));
     QVERIFY(!above(B, A));