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

Alleged Conflicts:
	examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
	examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
	examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc

In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !

Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3

1 files changed, 3 insertions, 4 deletions

diff --git a/src/webchannel/qwebchannelabstracttransport.cpp b/src/webchannel/qwebchannelabstracttransport.cpp
index 414c9fe..86a9c18 100644
--- a/src/webchannel/qwebchannelabstracttransport.cpp
+++ b/src/webchannel/qwebchannelabstracttransport.cpp
@@ -50,9 +50,8 @@ QT_BEGIN_NAMESPACE
 
     Users of the QWebChannel must implement this interface and connect instances of it
     to the QWebChannel server for every client that should be connected to the QWebChannel.
-    The {Qt WebChannel Standalone Example}{Standalone Example} shows how this can be done
-    using Qt WebSockets. Qt WebKit implements this interface internally and uses the native
-    WebKit IPC mechanism to transmit messages to HTML clients.
+    The \l{Qt WebChannel Standalone Example} shows how this can be done
+    using \l{Qt WebSockets}.
 
     \note The JSON message protocol is considered internal and might change over time.
 
@@ -69,7 +68,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn QWebChannelAbstractTransport::sendMessage(const QJsonObject &message)
 
-    Send a JSON \a message to the remote client. An implementation would serialize the message and
+    Sends a JSON \a message to the remote client. An implementation would serialize the message and
     transmit it to the remote JavaScript client.
 */