diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
| commit | 00156d63eea2fb7681a8a00a3144392d6325e5cb (patch) | |
| tree | 40f5159d523966cac856138a32d6d369c20b536b /src/imports/qmlwebsockets/qqmlwebsocket.cpp | |
| parent | c6d19a89046763f680d7f67c6f9989b4f51fc71e (diff) | |
| parent | ba9306ec5a1271275d79b2f48ceb227f79352f33 (diff) | |
| download | qtwebsockets-00156d63eea2fb7681a8a00a3144392d6325e5cb.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.cpp')
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index a5c7aeb..aea2c82 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -48,8 +48,7 @@ WebSockets is a web technology providing full-duplex communications channels over a single TCP connection. - The WebSocket protocol was standardized by the IETF as - \l {http://tools.ietf.org/html/rfc6455} {RFC 6455} in 2011. + The WebSocket protocol was standardized by the IETF as \l {RFC 6455} in 2011. */ /*! @@ -93,9 +92,9 @@ /*! \qmlsignal WebSocket::statusChanged(Status status) This signal is emitted when the status of the WebSocket changes. - the \l {WebSocket::status}{status} argument provides the current status. + the \l [QML]{WebSocket::status}{status} argument provides the current status. - \sa WebSocket::status + \sa {QtWebSockets::}{WebSocket::status} */ /*! |