diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-13 15:20:01 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-16 11:27:39 +0000 |
| commit | db65fae0b74643d18e9da64cfd75a16786ff6973 (patch) | |
| tree | 48f971e786888f6e330f5bb79cede97cee028bf5 /src/client/qwaylandintegration_p.h | |
| parent | a96dec760b19c85c67fb0cca649c22a12e7f51f5 (diff) | |
Fix build with QT_NO_ACCESSIBILITY
The accessibility() function is ifdef'd in the base class,
which makes build fail when Q_DECL_OVERRIDE is used here.
Change-Id: Ic3d800ccf32b39f5bc8d3f94d222bc0d34457057
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration_p.h')
| -rw-r--r-- | src/client/qwaylandintegration_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 671f7de28..b6a715353 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; |