diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:15:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:15:25 +0200 |
commit | b401f4ab3e0bcbf0da781a8d78032752f11500ab (patch) | |
tree | bc57ce0e3a14bde8c2b4bb6beabc94e34acdbbe8 | |
parent | 368adbf8e75c00712c7a30eb6b8d7a7e175e89d7 (diff) | |
parent | e0bf79a69dcec9825f815501bff181f12e3c33ed (diff) | |
download | qtwebchannel-b401f4ab3e0bcbf0da781a8d78032752f11500ab.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Ia5b809f6aeaa29c6acd6f45b696da285fe06b5f2
-rw-r--r-- | dist/changes-5.5.0 | 43 | ||||
-rw-r--r-- | src/webchannel/doc/src/index.qdoc | 18 |
2 files changed, 56 insertions, 5 deletions
diff --git a/dist/changes-5.5.0 b/dist/changes-5.5.0 new file mode 100644 index 0000000..a389fe7 --- /dev/null +++ b/dist/changes-5.5.0 @@ -0,0 +1,43 @@ +Qt 5.5 introduces many new features and improvements as well as bugfixes +over the 5.4.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.5 series is binary compatible with the 5.4.x series. +Applications compiled for 5.5 will continue to run with 5.5. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + + - Better support for objects containing child objects in properties, methods + and emitted signals. Such children now get wrapped on the fly as well and + are accessible to JavaScript clients. + + - Improved separation between and support for multiple clients connected to + a single WebChannel server. + +New Examples +-------------------- + + - qwclient: + A REPL client for any qwebchannel service using a websocket transport. + +Documentation +-------------------- + + - Reworded documentation to better explain the interaction with Qt WebEngine + and plain JavaScript clients using WebSockets. + diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc index 78534b6..5f354bd 100644 --- a/src/webchannel/doc/src/index.qdoc +++ b/src/webchannel/doc/src/index.qdoc @@ -31,13 +31,21 @@ \title Qt WebChannel \brief Bridges the gap between Qt applications and HTML/JavaScript. - The Qt WebChannel module provides a library for seamless integration of C++ and QML applications - with HTML/JavaScript clients. Any QObject can be published to remote clients, where its public - API becomes available. + 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. - \section1 Related Information + The module provides a JavaScript library for seamless integration of C++ + and QML applications with HTML/JavaScript clients. The client must use the + JavaScript library to access the serialized QObjects published by the host + applications. - For more information on how to use this module, please refer to the following pages: + \section1 Related Information \list \li \l{Qt WebChannel JavaScript API}{JavaScript API} |