diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:45 +0200 |
commit | fcaa38c84dc92ec951c43e1759d7a46080755cbc (patch) | |
tree | d5260091d450a79c83145b0b40e341162d2d0af2 /src | |
parent | 1e8595c525ec2abf8991d776f4d0fdb664964e69 (diff) | |
parent | 90123a9f30ee1173c9d64e415fc9b6e27a4227fc (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If43a69c30682eab4a40149a03c619047e84c9f6d
Diffstat (limited to 'src')
-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 bd59e4270..df88a4886 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 9cbc6e231..eb9c14094 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -850,6 +850,7 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowState state) mState = state; if (mShellSurface) { + createDecoration(); switch (state) { case Qt::WindowFullScreen: mShellSurface->setFullscreen(); |