diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-02-23 15:28:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-03-01 14:53:11 +0100 |
| commit | 36818145a95924712adfcb2d0f72d914e80596f3 (patch) | |
| tree | 1c12f73078a4319425b42827e074fa2900e940ea | |
| parent | 524296fc22bb9947e22ca205686fef07a9c1419b (diff) | |
Add accessibility to wayland.
The QPlatformAccessibility class simply loads the needed platform plugins on demand.
Change-Id: I9c384b6bb9244379bc14902489170f8877c49a2f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 159c0cc42..9d98d53a0 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -59,6 +59,7 @@ #include <QtGui/QOpenGLContext> #include <private/qplatforminputcontextfactory_qpa_p.h> +#include <qplatformaccessibility_qpa.h> #include <qplatforminputcontext_qpa.h> #ifdef QT_WAYLAND_GL_SUPPORT @@ -73,6 +74,7 @@ QWaylandIntegration::QWaylandIntegration() : mFontDb(new QGenericUnixFontDatabase()) , mEventDispatcher(createUnixEventDispatcher()) , mNativeInterface(new QWaylandNativeInterface) + , mAccessibility(new QPlatformAccessibility()) { QGuiApplicationPrivate::instance()->setEventDispatcher(mEventDispatcher); mDisplay = new QWaylandDisplay(); @@ -164,3 +166,8 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const #endif return QPlatformIntegration::styleHint(hint); } + +QPlatformAccessibility *QWaylandIntegration::accessibility() const +{ + return mAccessibility; +} diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index 8d0c0938b..8528b9953 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -74,6 +74,8 @@ public: QVariant styleHint(StyleHint hint) const; + QPlatformAccessibility *accessibility() const; + private: QPlatformFontDatabase *mFontDb; QAbstractEventDispatcher *mEventDispatcher; @@ -82,6 +84,7 @@ private: QWaylandDisplay *mDisplay; QPlatformNativeInterface *mNativeInterface; QPlatformInputContext *mInputContext; + QPlatformAccessibility *mAccessibility; }; QT_END_NAMESPACE |