1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with QT_NO_ACCESSIBILITY

Browse Source 
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>
This commit is contained in:
Samuli Piippo 2016-09-13 15:20:01 +03:00
parent 5f533e9ccc
commit 75bd5ca2b3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -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
{

4
src/plugins/platforms/wayland/qwaylandintegration_p.h
View File

@ -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;