From 134f5e0cce2ff10088e6b11bed4f7de9547748c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Wed, 28 Nov 2012 13:57:06 +0100
Subject: Cocoa: Disable accessibility.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The accessibility implementation is unstable and
causes application crashes. Disable until it has
been stabilized.

Change-Id: Ic34361a0ad599c6f92df722499d274fe0655646b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
 src/plugins/platforms/cocoa/cocoa.pro                     | 3 +++
 src/plugins/platforms/cocoa/qcocoaaccessibility.h         | 5 +++++
 src/plugins/platforms/cocoa/qcocoaaccessibility.mm        | 4 ++++
 src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h  | 4 ++++
 src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm | 5 +++++
 src/plugins/platforms/cocoa/qcocoaintegration.h           | 2 +-
 src/plugins/platforms/cocoa/qcocoaintegration.mm          | 4 ++--
 src/plugins/platforms/cocoa/qnsviewaccessibility.mm       | 4 ++++
 8 files changed, 28 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index ce46c46b0e..78fcf20afc 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -106,5 +106,8 @@ contains(QT_CONFIG,build_all):CONFIG -= build_all
 # DEFINES += QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR
 # include ($$PWD/../../../../util/accessibilityinspector/accessibilityinspector.pri)
 
+# Accessibility is currently unstable and disabled.
+DEFINES += QT_NO_COCOA_ACCESSIBILITY
+
 # Window debug support
 #DEFINES += QT_COCOA_ENABLE_WINDOW_DEBUG
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.h b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
index 6af13c8f92..7ddfd316f6 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
@@ -44,6 +44,9 @@
 #include <Cocoa/Cocoa.h>
 
 #include <QtGui>
+
+#ifndef QT_NO_COCOA_ACCESSIBILITY
+
 #include <qpa/qplatformaccessibility.h>
 
 class QCococaAccessibility : public QPlatformAccessibility
@@ -87,4 +90,6 @@ id getValueAttribute(QAccessibleInterface *interface);
 
 }
 
+#endif // QT_NO_COCOA_ACCESSIBILITY
+
 #endif
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 9733d12d26..e643f22793 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -44,6 +44,8 @@
 #include <qaccessible2.h>
 #include <private/qcore_mac_p.h>
 
+#ifndef QT_NO_COCOA_ACCESSIBILITY
+
 QCococaAccessibility::QCococaAccessibility()
 {
 
@@ -315,3 +317,5 @@ id getValueAttribute(QAccessibleInterface *interface)
 }
 
 } // namespace QCocoaAccessible
+
+#endif // QT_NO_COCOA_ACCESSIBILITY
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
index 25245c5c43..fce72da98f 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
@@ -45,6 +45,8 @@
 #import <Cocoa/Cocoa.h>
 #import <AppKit/NSAccessibility.h>
 
+#ifndef QT_NO_COCOA_ACCESSIBILITY
+
 @class QCocoaAccessibleElement;
 
 @interface QCocoaAccessibleElement : NSObject {
@@ -58,5 +60,7 @@
 
 @end
 
+#endif // QT_NO_COCOA_ACCESSIBILITY
+
 #endif
 
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 04284af594..df6b64443d 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -47,6 +47,8 @@
 
 #import <AppKit/NSAccessibility.h>
 
+#ifndef QT_NO_COCOA_ACCESSIBILITY
+
 static QAccessibleInterface *acast(void *ptr)
 {
     return reinterpret_cast<QAccessibleInterface *>(ptr);
@@ -254,3 +256,6 @@ static QAccessibleInterface *acast(void *ptr)
 }
 
 @end
+
+#endif // QT_NO_COCOA_ACCESSIBILITY
+
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index ea43bbbc10..dae9872566 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -128,7 +128,7 @@ private:
     QAbstractEventDispatcher *mEventDispatcher;
 
     QScopedPointer<QPlatformInputContext> mInputContext;
-#ifndef QT_NO_ACCESSIBILITY
+#ifndef QT_NO_COCOA_ACCESSIBILITY
     QScopedPointer<QPlatformAccessibility> mAccessibility;
 #endif
     QScopedPointer<QPlatformTheme> mPlatformTheme;
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 83c3efb2c6..3767fa014d 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -180,7 +180,7 @@ QCocoaIntegration::QCocoaIntegration()
     : mFontDb(new QCoreTextFontDatabase())
     , mEventDispatcher(new QCocoaEventDispatcher())
     , mInputContext(new QCocoaInputContext)
-#ifndef QT_NO_ACCESSIBILITY
+#ifndef QT_NO_COCOA_ACCESSIBILITY
     , mAccessibility(new QCococaAccessibility)
 #endif
     , mCocoaClipboard(new QCocoaClipboard)
@@ -358,7 +358,7 @@ QPlatformInputContext *QCocoaIntegration::inputContext() const
 
 QPlatformAccessibility *QCocoaIntegration::accessibility() const
 {
-#ifndef QT_NO_ACCESSIBILITY
+#ifndef QT_NO_COCOA_ACCESSIBILITY
     return mAccessibility.data();
 #else
     return 0;
diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
index 5c39402377..6824f19489 100644
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
@@ -51,6 +51,8 @@
 
 #import <AppKit/NSAccessibility.h>
 
+#ifndef QT_NO_COCOA_ACCESSIBILITY
+
 @implementation QNSView (QNSViewAccessibility)
 
 // The QNSView is a container that the user does not interact directly with:
@@ -101,3 +103,5 @@
 }
 
 @end
+
+#endif // QT_NO_COCOA_ACCESSIBILITY
-- 
cgit v1.2.3