diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 14:31:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 14:31:15 +0200 |
| commit | 3f5111b6c1d92ae4fed008abb53cf4226bfef575 (patch) | |
| tree | 53654662cd75aef95a343593295f1be48a1a007c /src/client | |
| parent | 5f256690a1e953ed456988b83daf43139b828131 (diff) | |
| parent | fcaa38c84dc92ec951c43e1759d7a46080755cbc (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/compositor/extensions/qwaylandxdgshell.cpp
Change-Id: Ic45b930e01fec803287d63b6f2347f45b7638ffc
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 4 | ||||
| -rw-r--r-- | src/client/qwaylandintegration_p.h | 4 | ||||
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index a7668b1f0..0e9eb44d6 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -125,8 +125,6 @@ QWaylandIntegration::QWaylandIntegration() , mNativeInterface(new QWaylandNativeInterface(this)) #ifndef QT_NO_ACCESSIBILITY , mAccessibility(new QPlatformAccessibility()) -#else - , mAccessibility(0) #endif , mClientBufferIntegrationInitialized(false) , mServerBufferIntegrationInitialized(false) @@ -262,10 +260,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 e7e0fe6b0..9a4990229 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -94,7 +94,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; @@ -129,7 +131,9 @@ private: QWaylandDisplay *mDisplay; QPlatformNativeInterface *mNativeInterface; QScopedPointer<QPlatformInputContext> mInputContext; +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *mAccessibility; +#endif bool mClientBufferIntegrationInitialized; bool mServerBufferIntegrationInitialized; bool mShellIntegrationInitialized; diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 473fe0912..9c42ac49c 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -855,6 +855,7 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowState state) mState = state; if (mShellSurface) { + createDecoration(); switch (state) { case Qt::WindowFullScreen: mShellSurface->setFullscreen(); |