diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-11 14:43:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-14 11:41:16 +0200 |
| commit | 736b3a6aca96e8c5d76aa08e62b71f47b3a02df6 (patch) | |
| tree | 1ba4e7c88dfdb58eb202e33b7bee27655ed724d5 /src/plugins/platforms/cocoa | |
| parent | bb22b4965070409df4658f16fdf549f0362e8a9c (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 6e845de790..0ebe5d5af1 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -86,11 +86,13 @@ public: QPlatformMenuBar *createPlatformMenuBar(QMenuBar *menuBar = 0) const; QPlatformNativeInterface *nativeInterface() const; + QPlatformAccessibility *accessibility() const; private: QPlatformFontDatabase *mFontDb; QAbstractEventDispatcher *mEventDispatcher; QCocoaAutoReleasePool *mPool; + QPlatformAccessibility *mAccessibility; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 18fa968ce1..e4d3bb01dd 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -51,6 +51,7 @@ #include "qcocoaapplicationdelegate.h" #include "qmenu_mac.h" +#include <QtGui/qplatformaccessibility_qpa.h> #include <QtCore/qcoreapplication.h> #include <QtPlatformSupport/private/qbasicfontdatabase_p.h> @@ -124,10 +125,13 @@ QCocoaIntegration::QCocoaIntegration() QCocoaScreen *screen = new QCocoaScreen(i); screenAdded(screen); } + + mAccessibility = new QPlatformAccessibility; } QCocoaIntegration::~QCocoaIntegration() { + delete mAccessibility; delete mPool; } @@ -183,4 +187,9 @@ QPlatformNativeInterface *QCocoaIntegration::nativeInterface() const return new QCocoaNativeInterface(); } +QPlatformAccessibility *QCocoaIntegration::accessibility() const +{ + return mAccessibility; +} + QT_END_NAMESPACE |