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

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

Browse Source 
Conflicts:
	src/compositor/extensions/qwaylandxdgshell.cpp

Change-Id: Ic45b930e01fec803287d63b6f2347f45b7638ffc
This commit is contained in:
Liang Qi 2016-09-20 14:31:15 +02:00
commit b93c902429
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)) , mNativeInterface(new QWaylandNativeInterface(this))
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
, mAccessibility(new QPlatformAccessibility()) , mAccessibility(new QPlatformAccessibility())
#else
, mAccessibility(0)
#endif #endif
, mClientBufferIntegrationInitialized(false) , mClientBufferIntegrationInitialized(false)
, mServerBufferIntegrationInitialized(false) , mServerBufferIntegrationInitialized(false)
@ -262,10 +260,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
return QPlatformIntegration::styleHint(hint); return QPlatformIntegration::styleHint(hint);
} }
#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *QWaylandIntegration::accessibility() const QPlatformAccessibility *QWaylandIntegration::accessibility() const
{ {
return mAccessibility; return mAccessibility;
} }
#endif
QPlatformServices *QWaylandIntegration::services() const 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; QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
#endif
QPlatformServices *services() const Q_DECL_OVERRIDE; QPlatformServices *services() const Q_DECL_OVERRIDE;
@ -129,7 +131,9 @@ private:
QWaylandDisplay *mDisplay; QWaylandDisplay *mDisplay;
QPlatformNativeInterface *mNativeInterface; QPlatformNativeInterface *mNativeInterface;
QScopedPointer<QPlatformInputContext> mInputContext; QScopedPointer<QPlatformInputContext> mInputContext;
#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *mAccessibility; QPlatformAccessibility *mAccessibility;
#endif
bool mClientBufferIntegrationInitialized; bool mClientBufferIntegrationInitialized;
bool mServerBufferIntegrationInitialized; bool mServerBufferIntegrationInitialized;
bool mShellIntegrationInitialized; bool mShellIntegrationInitialized;

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

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