diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
| commit | ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (patch) | |
| tree | 3379cee43d6acae95312e51e6cd05c3c4198a95e /examples/webchannel/standalone/doc/src/standalone.qdoc | |
| parent | 749951c19cbb7d301bed20f24d16dd4e713485c2 (diff) | |
| parent | d84318e98aa3cbac11b4f95b3581e95aab96a34a (diff) | |
| download | qtwebchannel-ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1
Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c
Diffstat (limited to 'examples/webchannel/standalone/doc/src/standalone.qdoc')
| -rw-r--r-- | examples/webchannel/standalone/doc/src/standalone.qdoc | 6 |
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 |