diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:02:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:02:45 +0200 |
| commit | 25fb211a32890a1bdd2b28b9727f6806a88d221c (patch) | |
| tree | 1ee37470ef14e34d96dc154831e56adce928a0ea | |
| parent | b376dfa4242db85269d138f7e9a77f5bb13964b6 (diff) | |
| parent | d20ca3487ed012fa176484170d23265c381b5501 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | dist/changes-5.13.0 | 23 | ||||
| -rw-r--r-- | examples/webchannel/standalone/doc/src/standalone.qdoc | 22 |
2 files changed, 35 insertions, 10 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0 new file mode 100644 index 0000000..045624d --- /dev/null +++ b/dist/changes-5.13.0 @@ -0,0 +1,23 @@ +Qt 5.13 introduces many new features and improvements as well as bugfixes +over the 5.12.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +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 * +**************************************************************************** + + - [QTBUG-62388] Fix crash when wrapped objects are shared across multiple + transports. diff --git a/examples/webchannel/standalone/doc/src/standalone.qdoc b/examples/webchannel/standalone/doc/src/standalone.qdoc index 6777492..4ff7056 100644 --- a/examples/webchannel/standalone/doc/src/standalone.qdoc +++ b/examples/webchannel/standalone/doc/src/standalone.qdoc @@ -64,18 +64,20 @@ \section1 Communicating with a Remote Client - The C++ application sets up a QWebChannel instance and publishes a \c Core object over it. - For the remote client side, \l {standalone/index.html}{index.html} is opened. Both show a - dialog with the list of received messages and an input box to send messages to the other end. + The C++ application sets up a QWebChannel instance and publishes a \c Core + object over it. For the remote client side, \l {standalone/index.html}{index.html} + is opened. Both show a dialog with the list of received messages and an input + box to send messages to the other end. - The \c Core emits the \c Core::sendText() signal when the user sends a message. The signal - automatically gets propagated to the HTML client. When the user enters a message on the HTML - side, \c Core::receiveText() is called. + The \c Core emits the \c Core::sendText() signal when the user sends + a message. The signal automatically gets propagated to the HTML client. + When the user enters a message on the HTML side, \c Core::receiveText() + is called. - 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 QWebChannelAbstractTransport objects. These objects are - then connected to the QWebChannel instance. + 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 QWebChannelAbstractTransport + objects. These objects are then connected to the QWebChannel instance. \sa {Qt WebChannel JavaScript API} */ |