Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: Id64ad5564f3cd85829ede15ebf33db13cd1587fa

4 files changed, 97 insertions, 4 deletions

diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 000000000..8805b45fe
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,41 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. 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.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+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 5.10.0 Changes                 *
+****************************************************************************
+
+ - [QTBUG-58423] Make sure wl_surface exists when SurfaceCreated is sent.
+
+ - Set QScreen product information.
+
+ - Shared memory buffers are now created in a thread safe manner,
+   and are simple memory buffers that do not exist on disk.
+
+****************************************************************************
+*                   Qt Wayland Compositor API 5.10.0 Changes               *
+****************************************************************************
+
+ - [QTBUG-56174] Add support for xdg-shell-unstable-v6.
+
+
+****************************************************************************
+*                      Qt Wayland 5.10.0 General Changes                   *
+****************************************************************************
+
+- The server buffer integration has been updated to be more stable, and
+  the (private) API is now more usable.
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3
new file mode 100644
index 000000000..ba81445c0
--- /dev/null
+++ b/dist/changes-5.9.3
@@ -0,0 +1,52 @@
+Qt 5.9.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9. Exception:
+between Qt 5.8.0 and 5.9.0 the QWaylandQuickOutput class was changed
+in a binary incompatible way.
+
+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 5.9.3 Changes                 *
+****************************************************************************
+
+ - Fix crash when wl-shell setType is called with a hidden parent.
+
+ - [QTBUG-63840] Fix crash with XDG shell v6 when parent of popup is not
+   initialized.
+
+ - Fix flickering if backing store is flushed multiple times between paints.
+
+****************************************************************************
+*                    Qt Wayland Compositor API 5.9.3 Changes               *
+****************************************************************************
+
+- [QTBUG-63208] Fix crash after destroying view with mouse focus
+
+- [QTBUG-63039] Make multi-threaded QML compositors work with Nvidia
+  EGLStreams. Note: this requires setting the Qt::AA_ShareOpenGLContexts
+  application attribute.
+
+- Add missing signals for properties:
+   * QWaylandSurface::cursorSurfaceChanged
+   * QWaylandOutput::windowChanged
+   * QWaylandOutput::geometryChanged
+   * QWaylandOutput::availableGeometryChanged
+   * QWaylandCompositor::socketNameChanged
+
+- [QTBUG-62638] Make sure mask is applied when window is reset.
+
diff --git a/src/client/qwaylandbuffer.cpp b/src/client/qwaylandbuffer.cpp
index 076a0d57d..a0fcc532f 100644
--- a/src/client/qwaylandbuffer.cpp
+++ b/src/client/qwaylandbuffer.cpp
@@ -66,7 +66,7 @@ void QWaylandBuffer::init(wl_buffer *buf)
 
 void QWaylandBuffer::release(void *data, wl_buffer *)
 {
-    static_cast<QWaylandBuffer *>(data)->mBusy--;
+    static_cast<QWaylandBuffer *>(data)->mBusy = false;
 }
 
 const wl_buffer_listener QWaylandBuffer::listener = {
diff --git a/src/client/qwaylandbuffer_p.h b/src/client/qwaylandbuffer_p.h
index b3513d151..9e8cba2e4 100644
--- a/src/client/qwaylandbuffer_p.h
+++ b/src/client/qwaylandbuffer_p.h
@@ -73,14 +73,14 @@ public:
     virtual QSize size() const = 0;
     virtual int scale() const { return 1; }
 
-    void setBusy() { mBusy++; }
-    bool busy() const { return mBusy > 0; }
+    void setBusy() { mBusy = true; }
+    bool busy() const { return mBusy; }
 
 protected:
     struct wl_buffer *mBuffer;
 
 private:
-    int mBusy;
+    bool mBusy;
 
     static void release(void *data, wl_buffer *);
     static const wl_buffer_listener listener;