diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/webchannel/doc/src/index.qdoc | 15 | ||||
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 2 | ||||
| -rw-r--r-- | src/webchannel/qwebchannelabstracttransport.cpp | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc index 5f354bd..a4eaad0 100644 --- a/src/webchannel/doc/src/index.qdoc +++ b/src/webchannel/doc/src/index.qdoc @@ -31,14 +31,13 @@ \title Qt WebChannel \brief Bridges the gap between Qt applications and HTML/JavaScript. - Qt WebChannel enables peer-to-peer communication between the host - (QML/C++ application) and the client (HTML/JavaScript application). The - transport mechanism is supported out of the box by the two popular web - engines, Qt WebKit 2 and Qt WebEngine (experimental). It works on all - browsers that support Qt WebSockets, enabling Qt WebChannel applications - to run in any JavaScript runtime. Additionally, a custom transport - mechanism can also be implemented using Qt WebSockets to support Qt - WebChannel-based communication. + Qt WebChannel enables peer-to-peer communication between a host + (QML/C++ application) and a client (HTML/JavaScript application). + It is supported out of the box by Qt WebKit 2 and Qt WebEngine. + In addition it can work on all + browsers that support WebSockets, enabling Qt WebChannel clients + to run in any JavaScript environment (including QML). This requires + the implementation of a custom transport based on Qt WebSockets. The module provides a JavaScript library for seamless integration of C++ and QML applications with HTML/JavaScript clients. The client must use the diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index f5109b6..c48fc84 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -94,7 +94,7 @@ public: virtual ~QMetaObjectPublisher(); /** - * Register @p object nuder the given @p id. + * Register @p object under the given @p id. * * The properties, signals and public methods of the QObject are * published to the remote client, where an object with the given identifier diff --git a/src/webchannel/qwebchannelabstracttransport.cpp b/src/webchannel/qwebchannelabstracttransport.cpp index 414c9fe..d1b7199 100644 --- a/src/webchannel/qwebchannelabstracttransport.cpp +++ b/src/webchannel/qwebchannelabstracttransport.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE Users of the QWebChannel must implement this interface and connect instances of it to the QWebChannel server for every client that should be connected to the QWebChannel. - The {Qt WebChannel Standalone Example}{Standalone Example} shows how this can be done + The \l {Qt WebChannel Standalone Example}{Standalone Example} shows how this can be done using Qt WebSockets. Qt WebKit implements this interface internally and uses the native WebKit IPC mechanism to transmit messages to HTML clients. |