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

Change-Id: If43a69c30682eab4a40149a03c619047e84c9f6d

dist/changes-5.6.2

+Qt 5.6.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+Qt Wayland QPA Plugin
+-------
+
+ - Fixed drag and drop from the application to itself when running on Weston
+ - Improved the HIDPI support
+ - Fixed a crash when dragging a window with touch input and no pointer
+ - Fixed a crash on application exit
+ - Made it use the proper activation mechanism when using xdg_shell
+ - Fixed returning to the same window size when unmaximizing on xdg shell
+ - Fixed the window resize area being too big on the bottom and right edges

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
 {

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;

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();