diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
| commit | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (patch) | |
| tree | 174e872c084319e19cd0ebd74915048d99c18c84 /src/imports/qmlwebsockets/qqmlwebsocket.cpp | |
| parent | 40c0c43f59b97e5bee4a8994a499800e1f46b8d1 (diff) | |
| parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
| download | qtwebsockets-2baa571e0d95d3e9bf182dc035c8ff0970bb68ea.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
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 13b986e..9ff88d5 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. */ /*! @@ -99,9 +98,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} */ /*! |