summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:02:45 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:02:45 +0200
commitd20ca3487ed012fa176484170d23265c381b5501 (patch)
tree1ee37470ef14e34d96dc154831e56adce928a0ea /examples
parentb376dfa4242db85269d138f7e9a77f5bb13964b6 (diff)
parent986ce4a02ba9b33b908cdbdc46e3ceda0e50b99f (diff)
downloadqtwebchannel-d20ca3487ed012fa176484170d23265c381b5501.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia830dee20e2674c73551319be153ec3e638b5b0e
Diffstat (limited to 'examples')
-rw-r--r--examples/webchannel/standalone/doc/src/standalone.qdoc22
1 files changed, 12 insertions, 10 deletions
diff --git a/examples/webchannel/standalone/doc/src/standalone.qdoc b/examples/webchannel/standalone/doc/src/standalone.qdoc
index 6777492..4ff7056 100644
--- a/examples/webchannel/standalone/doc/src/standalone.qdoc
+++ b/examples/webchannel/standalone/doc/src/standalone.qdoc
@@ -64,18 +64,20 @@
\section1 Communicating with a Remote Client
- The C++ application sets up a QWebChannel instance and publishes a \c Core object over it.
- For the remote client side, \l {standalone/index.html}{index.html} is opened. Both show a
- dialog with the list of received messages and an input box to send messages to the other end.
+ The C++ application sets up a QWebChannel instance and publishes a \c Core
+ object over it. For the remote client side, \l {standalone/index.html}{index.html}
+ is opened. Both show a dialog with the list of received messages and an input
+ box to send messages to the other end.
- The \c Core emits the \c Core::sendText() signal when the user sends a message. The signal
- automatically gets propagated to the HTML client. When the user enters a message on the HTML
- side, \c Core::receiveText() is called.
+ The \c Core emits the \c Core::sendText() signal when the user sends
+ a message. The signal automatically gets propagated to the HTML client.
+ When the user enters a message on the HTML side, \c Core::receiveText()
+ is called.
- All communication between the HTML client and the C++ server is done over a WebSocket.
- The C++ side instantiates a QWebSocketServer and wraps incoming QWebSocket connections
- in QWebChannelAbstractTransport objects. These objects are
- then connected to the QWebChannel instance.
+ All communication between the HTML client and the C++ server is done
+ over a WebSocket. The C++ side instantiates a QWebSocketServer and
+ wraps incoming QWebSocket connections in QWebChannelAbstractTransport
+ objects. These objects are then connected to the QWebChannel instance.
\sa {Qt WebChannel JavaScript API}
*/