summaryrefslogtreecommitdiff
path: root/examples/webchannel/standalone/doc/src/standalone.qdoc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-22 12:34:29 +0200
committerLiang Qi <liang.qi@qt.io>2017-09-22 12:34:29 +0200
commitc0900bdd63601fab2ae0df80a7d6c5a0d53355ff (patch)
tree28880f5639afc150f62cba08aafec6602c9b515c /examples/webchannel/standalone/doc/src/standalone.qdoc
parent48e574234f4a007f448b5d8fbd470fa6138bce64 (diff)
parentba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (diff)
downloadqtwebchannel-c0900bdd63601fab2ae0df80a7d6c5a0d53355ff.tar.gz
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I0b7d3d5789c0c3ef11d96c83c3f61d0de65f3593
Diffstat (limited to 'examples/webchannel/standalone/doc/src/standalone.qdoc')
-rw-r--r--examples/webchannel/standalone/doc/src/standalone.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/webchannel/standalone/doc/src/standalone.qdoc b/examples/webchannel/standalone/doc/src/standalone.qdoc
index 0d030bf..6777492 100644
--- a/examples/webchannel/standalone/doc/src/standalone.qdoc
+++ b/examples/webchannel/standalone/doc/src/standalone.qdoc
@@ -64,13 +64,13 @@
\section1 Communicating with a Remote Client
- The C++ application sets up a QWebChannel instance and publishes a \c Dialog object over it.
+ 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 Dialog emits the \c Dialog::sendText() signal when the user sends a message. The signal
+ 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 Dialog::receiveText() is called.
+ 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