diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-08-01 15:20:35 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2014-08-04 14:52:07 +0200 |
| commit | 0ed8f57e9aba977acede9496a83401058f3b090b (patch) | |
| tree | 9c02e3ab36780bb9fd8780c01e7a75ff439a1065 /src/webchannel/doc/src/javascript.qdoc | |
| parent | aa75a39b3e3a4ae762f05b4a2e91d9790c8d5c88 (diff) | |
| download | qtwebchannel-0ed8f57e9aba977acede9496a83401058f3b090b.tar.gz | |
Fixup documentation issues.
These issues were raised by Sze Howe Koh in code review 89965 of
change I259c204e. This change set does not yet include any comparison
to the old Qt WebKit bridging functionality. I'll hand this in later.
Change-Id: Idc7df0e02bfcda3c3fcf1a4e147c1dfac4f18a64
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'src/webchannel/doc/src/javascript.qdoc')
| -rw-r--r-- | src/webchannel/doc/src/javascript.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webchannel/doc/src/javascript.qdoc b/src/webchannel/doc/src/javascript.qdoc index 36bc4ab..de211d0 100644 --- a/src/webchannel/doc/src/javascript.qdoc +++ b/src/webchannel/doc/src/javascript.qdoc @@ -34,7 +34,7 @@ \section1 Setup To communicate with a QWebChannel or WebChannel, any HTML client must use and setup the - JavaScript API provided by \c qwebchannel.js. For HTML clients run inside QtWebKit, you + JavaScript API provided by \c qwebchannel.js. For HTML clients run inside Qt WebKit, you can load the file via \c qrc:///qtwebchannel/qwebchannel.js. For external clients you will need to copy the file to your webserver. Then instantiate a QWebChannel object and pass it a transport object and a callback function, which will be invoked once the @@ -44,7 +44,7 @@ with a \c send() function, which takes a stringified JSON message and transmits it to the server-side QWebChannelAbstractTransport object. Furthermore, its \c onmessage property should be called when a message from the server was received. This interface is implemented internally - by the QtWebKit navigator.qtWebChannelTransport object. Alternatively, you can also use a + by the Qt WebKit navigator.qtWebChannelTransport object. Alternatively, you can also use a WebSocket, which also implements this interface. Note that the JavaScript QWebChannel object should be constructed once the transport object is |