diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:00:12 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 03:00:19 +0200 |
commit | bfe9885c1974e9962ca3b0b88030d08a03dfa05c (patch) | |
tree | c82c864ac22e8a534732ee6d8d600e54c4984afb | |
parent | c1b6fbfb734063edb9315c109f227c90bd69fbec (diff) | |
parent | 434a1bc283016305c2b7600ed4e5dc9077292bee (diff) | |
download | qtwebsockets-bfe9885c1974e9962ca3b0b88030d08a03dfa05c.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
-rw-r--r-- | dist/changes-5.13.0 | 18 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 8 |
2 files changed, 23 insertions, 3 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0 new file mode 100644 index 0000000..ebb4be1 --- /dev/null +++ b/dist/changes-5.13.0 @@ -0,0 +1,18 @@ +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. + + - This release contains only minor code improvements. diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 37a2fad..7f862e0 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -87,31 +87,33 @@ /*! \qmlsignal WebSocket::textMessageReceived(QString message) This signal is emitted when a text message is received. + \a message contains the bytes received. */ /*! \qmlsignal WebSocket::binaryMessageReceived(QString message) \since 5.8 This signal is emitted when a binary message is received. + \a message contains the bytes received. */ /*! \qmlsignal WebSocket::statusChanged(Status status) This signal is emitted when the status of the WebSocket changes. - the \l [QML]{WebSocket::status}{status} argument provides the current status. + The \a status argument provides the current status. \sa {QtWebSockets::}{WebSocket::status} */ /*! \qmlmethod void WebSocket::sendTextMessage(string message) - Sends \c message to the server. + Sends \a message to the server. */ /*! \qmlmethod void WebSocket::sendBinaryMessage(ArrayBuffer message) \since 5.8 - Sends \c message to the server. + Sends the parameter \a message to the server. */ #include "qqmlwebsocket.h" |