summaryrefslogtreecommitdiff
path: root/src/webchannel/qwebchannel.cpp
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2014-08-17 19:37:32 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-08-23 16:11:50 +0200
commitdac411122a9275eac6b94c1cd3ca0c300937cf83 (patch)
tree01c78ef0e0f3028c80664443ba64a0a7d62496f5 /src/webchannel/qwebchannel.cpp
parentbef82079db57ce6c4626dc4f3b6c36386713f7d1 (diff)
downloadqtwebchannel-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 'src/webchannel/qwebchannel.cpp')
-rw-r--r--src/webchannel/qwebchannel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webchannel/qwebchannel.cpp b/src/webchannel/qwebchannel.cpp
index e3df0b9..928e8d4 100644
--- a/src/webchannel/qwebchannel.cpp
+++ b/src/webchannel/qwebchannel.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
The QWebChannel fills the gap between C++ applications and HTML/JavaScript
applications. By publishing a QObject derived object to a QWebChannel and
- using \l{qtwebchannel-javascript.html}{\c qwebchannel.js} on the HTML side, one can transparently access
+ using the \l{Qt WebChannel JavaScript API}{qwebchannel.js} on the HTML side, one can transparently access
properties and public slots and methods of the QObject. No manual message
passing and serialization of data is required, property updates and signal emission
on the C++ side get automatically transmitted to the potentially remotely running HTML clients.
@@ -68,12 +68,12 @@ QT_BEGIN_NAMESPACE
The C++ QWebChannel API makes it possible to talk to any HTML client, which could run on a local
or even remote machine. The only limitation is that the HTML client supports the JavaScript
- features used by \l{qtwebchannel-javascript.html}{\c qwebchannel.js}. As such, one can interact
+ features used by \c{qwebchannel.js}. As such, one can interact
with basically any modern HTML browser or standalone JavaScript runtime, such as node.js.
There also exists a declarative WebChannel API.
- \sa {Qt WebChannel Standalone Example}
+ \sa {Qt WebChannel Standalone Example}, {Qt WebChannel JavaScript API}{JavaScript API}
*/
/*!