diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index e62ef87f1984adf5cc2cad95b3e8d9d15d6cf5c7..17b3f681b94f0b8bd62ce85e5dfe1f22b142d3fc 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -119,8 +119,6 @@ QWaylandIntegration::QWaylandIntegration() , mNativeInterface(new QWaylandNativeInterface(this)) #ifndef QT_NO_ACCESSIBILITY , mAccessibility(new QPlatformAccessibility()) -#else - , mAccessibility(0) #endif , mClientBufferIntegrationInitialized(false) , mServerBufferIntegrationInitialized(false) @@ -245,10 +243,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const return QPlatformIntegration::styleHint(hint); } +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *QWaylandIntegration::accessibility() const { return mAccessibility; } +#endif QPlatformServices *QWaylandIntegration::services() const { diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 671f7de2884f30e2d790ef8055424426fea7db72..b6a715353d328489cf88cf00868a6caf08dd1316 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -88,7 +88,9 @@ public: QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; +#endif QPlatformServices *services() const Q_DECL_OVERRIDE; @@ -123,7 +125,9 @@ private: QWaylandDisplay *mDisplay; QPlatformNativeInterface *mNativeInterface; QScopedPointer<QPlatformInputContext> mInputContext; +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *mAccessibility; +#endif bool mClientBufferIntegrationInitialized; bool mServerBufferIntegrationInitialized; bool mShellIntegrationInitialized;