Accessibility plugin for mac and xcb.

Instead of creating new instances of the class whenever
accessibility() is called, create one on startup.

Change-Id: Idd5b06ee935d7acf4934b98882d254a1ef0ca04e
Reviewed-on: http://codereview.qt-project.org/6435
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>

2 files changed, 13 insertions, 0 deletions

diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 185765bb34..91d7e287f3 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -78,6 +78,7 @@
 
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QScreen>
+#include <QtGui/QPlatformAccessibility>
 
 QXcbIntegration::QXcbIntegration(const QStringList &parameters)
     : m_eventDispatcher(createUnixEventDispatcher())
@@ -104,11 +105,14 @@ QXcbIntegration::QXcbIntegration(const QStringList &parameters)
     m_nativeInterface = new QXcbNativeInterface;
 
     m_inputContext = QPlatformInputContextFactory::create();
+
+    m_accessibility = new QPlatformAccessibility();
 }
 
 QXcbIntegration::~QXcbIntegration()
 {
     qDeleteAll(m_connections);
+    delete m_accessibility;
 }
 
 QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const
@@ -228,3 +232,8 @@ QPlatformInputContext *QXcbIntegration::inputContext() const
 {
     return m_inputContext;
 }
+
+QPlatformAccessibility *QXcbIntegration::accessibility() const
+{
+    return m_accessibility;
+}
diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h
index cad127c28e..d451507425 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.h
+++ b/src/plugins/platforms/xcb/qxcbintegration.h
@@ -74,6 +74,8 @@ public:
 
     QPlatformInputContext *inputContext() const;
 
+    QPlatformAccessibility *accessibility() const;
+
 private:
     QList<QXcbConnection *> m_connections;
 
@@ -82,6 +84,8 @@ private:
 
     QPlatformInputContext *m_inputContext;
     QAbstractEventDispatcher *m_eventDispatcher;
+
+    QPlatformAccessibility *m_accessibility;
 };
 
 QT_END_NAMESPACE