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

Conflicts:
	src/webchannel/doc/src/index.qdoc
	src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.

	src/webchannel/qmetaobjectpublisher.cpp
	tests/auto/webchannel/tst_webchannel.cpp
	tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.

Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0

1 files changed, 3 insertions, 4 deletions

diff --git a/src/webchannel/qwebchannelabstracttransport.cpp b/src/webchannel/qwebchannelabstracttransport.cpp
index d1b7199..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 \l {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.
 */