Merge remote-tracking branch 'qt/5.7' into dev

Change-Id: Ib22055ac52c0bb36081242948c72332db4e5ac64

11 files changed, 20 insertions, 17 deletions

diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp
index 2b6091f93..0b21bcd63 100644
--- a/src/compositor/compositor_api/qwaylandclient.cpp
+++ b/src/compositor/compositor_api/qwaylandclient.cpp
@@ -134,8 +134,8 @@ QWaylandClient::~QWaylandClient()
 }
 
 /*!
- * Returns the QWaylandClient corresponding to the Wayland client \a wl_client and \a compositor.
- * If a QWaylandClient has not already been created for \a client, it is
+ * Returns the QWaylandClient corresponding to the Wayland client \a wlClient and \a compositor.
+ * If a QWaylandClient has not already been created for a client, it is
  * created and returned.
  */
 QWaylandClient *QWaylandClient::fromWlClient(QWaylandCompositor *compositor, wl_client *wlClient)
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 450e94ae8..a8c1eb3d2 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -848,7 +848,7 @@ void QWaylandCompositor::setUseHardwareIntegrationExtension(bool use)
  * to implement custom logic.
  * The default implementation only grabs shared memory and OpenGL buffers, reimplement this in your
  * compositor subclass to handle more buffer types.
- * You should not call this manually, but rather use \a QWaylandSurfaceGrabber.
+ * You should not call this manually, but rather use QWaylandSurfaceGrabber (\a grabber).
  */
 void QWaylandCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const QWaylandBufferRef &buffer)
 {
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp
index 09c02bc48..4c2a0b439 100644
--- a/src/compositor/compositor_api/qwaylandinput.cpp
+++ b/src/compositor/compositor_api/qwaylandinput.cpp
@@ -467,7 +467,7 @@ QWaylandInputDevice *QWaylandInputDevice::fromSeatResource(struct ::wl_resource
 }
 
 /*!
- * \fn void mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus)
+ * \fn void QWaylandInputDevice::mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus)
  *
  * This signal is emitted when the mouse focus has changed from \a oldFocus to \a newFocus.
  */
diff --git a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
index beeea9f98..f751a3d96 100644
--- a/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
+++ b/src/compositor/compositor_api/qwaylandsurfacegrabber.cpp
@@ -94,7 +94,7 @@ QWaylandSurface *QWaylandSurfaceGrabber::surface() const
 
 /*!
  * Grab the content of the surface set on this object.
- * It may not be possible to do that immediately so the \a success and \a failed signals
+ * It may not be possible to do that immediately so the success and failed signals
  * should be used to be notified of when the grab is completed.
  */
 void QWaylandSurfaceGrabber::grab()
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp
index f11ef5fe0..8501c3f29 100644
--- a/src/compositor/compositor_api/qwaylandview.cpp
+++ b/src/compositor/compositor_api/qwaylandview.cpp
@@ -307,7 +307,10 @@ bool QWaylandView::isBufferLocked() const
 void QWaylandView::setBufferLocked(bool locked)
 {
     Q_D(QWaylandView);
+    if (d->bufferLocked == locked)
+        return;
     d->bufferLocked = locked;
+    emit bufferLockedChanged();
 }
 
 /*!
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index f6dfc8323..cdb59dfc1 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -352,12 +352,9 @@ const struct wl_interface *QWaylandWlShell::interface()
  */
 
 /*!
- * \fn void QWaylandWlShell::createShellSurface(QWaylandSurface *surface, QWaylandClient *client, uint id)
+ * \fn void QWaylandWlShell::createShellSurface(QWaylandSurface *surface, const QWaylandResource &resource)
  *
- * This signal is emitted when the \a client has requested a shell surface to be associated
- * with \a surface and be assigned the given \a id. The handler for this signal is
- * expected to create the shell surface and initialize it within the scope of the
- * signal emission.
+ * Constructs a QWaylandSurface, assigns it to \a surface and initializes it with the given \a resource.
  */
 
 /*!
@@ -403,7 +400,7 @@ QWaylandWlShellSurface::QWaylandWlShellSurface()
 }
 
 /*!
- * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and \a resource.
+ * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and resource \a res.
  */
 QWaylandWlShellSurface::QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &res)
     : QWaylandShellSurfaceTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
@@ -627,12 +624,12 @@ QWaylandSurfaceRole *QWaylandWlShellSurface::role()
 /*!
  * \qmlmethod void QtWaylandCompositor::WlShellSurface::ping()
  *
- * Sends a ping event to the client. If the client replies to the event the \a pong
+ * Sends a ping event to the client. If the client replies to the event the pong
  * signal will be emitted.
  */
 
 /*!
- * Sends a ping event to the client. If the client replies to the event the \a pong
+ * Sends a ping event to the client. If the client replies to the event the pong
  * signal will be emitted.
  */
 void QWaylandWlShellSurface::ping()
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 96fc171d8..d818736ff 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -648,7 +648,7 @@ QWaylandXdgSurface::QWaylandXdgSurface()
 
 /*!
  * Constructs a QWaylandXdgSurface for \a surface and initializes it with the
- * given \a xdgShell, \a surface and \a resource.
+ * given \a xdgShell, \a surface, and resource \a res.
  */
 QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *xdgShell, QWaylandSurface *surface, const QWaylandResource &res)
     : QWaylandShellSurfaceTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate)
@@ -740,7 +740,7 @@ QWaylandSurface *QWaylandXdgSurface::surface() const
  */
 
 /*!
- * \property QWaylandXdgSurface::surface
+ * \property QWaylandXdgSurface::parentSurface
  *
  * This property holds the XdgSurface parent of this XdgSurface.
  * When a parent surface is set, the parentSurfaceChanged() signal
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index d513eefa3..d528b2327 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -73,7 +73,7 @@ public:
     bool isSharing() const Q_DECL_OVERRIDE;
     bool isValid() const Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE;
+    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
 
     QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
index 4435f481b..52653c4ae 100644
--- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
+++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
@@ -8,6 +8,7 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri)
     LIBS += -lXcomposite -lX11
 }
 
+QT += platformsupport-private
 CONFIG += egl
 
 SOURCES += \
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index eff75f292..862ed928b 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -64,7 +64,7 @@ public:
     bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
     void doneCurrent() Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE;
+    QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE;
 
 private:
     GLXContext m_context;
diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
index 3ecf5e7cb..11c051728 100644
--- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
+++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
@@ -8,6 +8,8 @@ include ($$PWD/../xcomposite_share/xcomposite_share.pri)
     LIBS += -lXcomposite -lGL -lX11
 }
 
+QT += platformsupport-private
+
 SOURCES += \
     $$PWD/qwaylandxcompositeglxcontext.cpp \
     $$PWD/qwaylandxcompositeglxintegration.cpp \