summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-17 22:55:45 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-17 22:55:45 +0200
commitfcaa38c84dc92ec951c43e1759d7a46080755cbc (patch)
treed5260091d450a79c83145b0b40e341162d2d0af2
parent1e8595c525ec2abf8991d776f4d0fdb664964e69 (diff)
parent90123a9f30ee1173c9d64e415fc9b6e27a4227fc (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
-rw-r--r--dist/changes-5.6.230
-rw-r--r--src/client/qwaylandintegration.cpp4
-rw-r--r--src/client/qwaylandintegration_p.h4
-rw-r--r--src/client/qwaylandwindow.cpp1
4 files changed, 37 insertions, 2 deletions
diff --git a/dist/changes-5.6.2 b/dist/changes-5.6.2
new file mode 100644
index 00000000..18384f78
--- /dev/null
+++ b/dist/changes-5.6.2
@@ -0,0 +1,30 @@
+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
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index bd59e427..df88a488 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 e7e0fe6b..9a499022 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 9cbc6e23..eb9c1409 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();