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:12 +0200 |
commit | 434a1bc283016305c2b7600ed4e5dc9077292bee (patch) | |
tree | c82c864ac22e8a534732ee6d8d600e54c4984afb /src | |
parent | c1b6fbfb734063edb9315c109f227c90bd69fbec (diff) | |
parent | b7b3ef26b7da4d25c61bfbc193d3158c6d50330c (diff) | |
download | qtwebsockets-434a1bc283016305c2b7600ed4e5dc9077292bee.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I2a1987a687fafb73b3b8368db93bcca7a91bb5d0
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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" |