diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2014-08-17 19:37:32 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-08-23 16:11:50 +0200 |
commit | dac411122a9275eac6b94c1cd3ca0c300937cf83 (patch) | |
tree | 01c78ef0e0f3028c80664443ba64a0a7d62496f5 /examples/webchannel | |
parent | bef82079db57ce6c4626dc4f3b6c36386713f7d1 (diff) | |
download | qtwebchannel-dac411122a9275eac6b94c1cd3ca0c300937cf83.tar.gz |
Doc: Edited links JavaScript API page and other documentation fixes.
The JavaScript API page is important to the rest of the documentation
but there was no link to it.
Task-number: QTBUG-40756
Change-Id: Id741a67ac2b57e21da548c2961c622c7516ac8cf
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'examples/webchannel')
-rw-r--r-- | examples/webchannel/standalone/doc/src/standalone.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/webchannel/standalone/doc/src/standalone.qdoc b/examples/webchannel/standalone/doc/src/standalone.qdoc index c5199c3..8dde2b1 100644 --- a/examples/webchannel/standalone/doc/src/standalone.qdoc +++ b/examples/webchannel/standalone/doc/src/standalone.qdoc @@ -46,7 +46,7 @@ \image standalone-screenshot.png \brief Shows how to use the QWebChannel C++ API to communicate with an external client. - The standalone example is a simple chat between a pure C++/Qt application and a remote HTML + The standalone example is a simple chat between a C++ application and a remote HTML client running in your default browser. \include examples-run.qdocinc @@ -61,8 +61,10 @@ automatically gets propagated to the HTML client. When the user enters a message on the HTML side, Dialog::receiveText() is called. - All communication between the HTML client and the C++/Qt server is done over a WebSocket. + 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 WebSocketTransport objects, which implement QWebChannelAbstractTransport. These objects are then connected to the QWebChannel instance. + + \sa {Qt WebChannel JavaScript API} */ |