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

Merge remote-tracking branch 'origin/5.6' into 5.7

Browse Source 
Change-Id: If43a69c30682eab4a40149a03c619047e84c9f6d
This commit is contained in:
Liang Qi 2016-09-17 22:55:45 +02:00
commit 867734461f
3 changed files with 7 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

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

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

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

1
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -850,6 +850,7 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowState state)
mState = state;
if (mShellSurface) {
createDecoration();
switch (state) {
case Qt::WindowFullScreen:
mShellSurface->setFullscreen();