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

Conflicts:
	configure
	src/plugins/platforms/eglfs/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp

Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b

1 files changed, 29 insertions, 0 deletions

diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
index 241dff05da..f0ef5ee2a7 100644
--- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
+++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
@@ -86,6 +86,35 @@
 */
 
 /*!
+    \typedef QXcbWindowFunctions::SetWmWindowRole
+    \since 5.6.2
+
+    This is the typedef for the function returned by
+    QGuiApplication::platformFunction when passed the
+    value returned by setWmWindowRoleIdentifier().
+*/
+
+/*!
+    \fn QByteArray QXcbWindowFunctions::setWmWindowRoleIdentifier()
+    \since 5.6.2
+
+    This function returns the byte array that can be used to query
+    QGuiApplication::platformFunction to retrieve the SetWmWindowRole function.
+*/
+
+/*!
+    \fn void QXcbWindowFunctions::setWmWindowRole(QWindow *window, const QByteArray &role)
+    \since 5.6.2
+
+    Sets the WM_WINDOW_ROLE property from \role on the corresponding
+    X11 window.
+
+    This is a convenience function that can be used directly instead
+    of resolving the function pointer. \a window and \a role will be
+    relayed to the function retrieved by QGuiApplication.
+*/
+
+/*!
     \typedef QXcbWindowFunctions::SetWmWindowIconText
 
     This is the typedef for the function returned by