From db65fae0b74643d18e9da64cfd75a16786ff6973 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 13 Sep 2016 15:20:01 +0300 Subject: 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 --- src/client/qwaylandintegration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/qwaylandintegration.cpp') diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index e62ef87f1..17b3f681b 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 { -- cgit v1.2.3