From be4bfc5feeb61e97378bee325d36bb74f007fe04 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 7 Apr 2016 09:52:29 +0200 Subject: Doc: Add external-resources.qdoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also sanitize some linking, e.g. by referencing to the paper by title, not by link. Change-Id: I95482994ca569001a23a3beb0e3cbe6739f4ed77 Reviewed-by: Leena Miettinen Reviewed-by: Topi Reiniö --- src/imports/qmlwebsockets/qqmlwebsocket.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.cpp') diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 82a5f9b..ef97413 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -42,8 +42,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. */ /*! -- cgit v1.2.1 From a126127f2c2bc1c8f4c7e44ea543057397bbdafa Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 7 Apr 2016 13:47:16 +0200 Subject: Doc: Avoid auto-linking of WebSocket, WebSockets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable the automatic linking of 'WebSocket' to the QML type, and 'WebSockets' to a section in the general documentation. Instead, make the linking explicit where it makes sense. This patch is inspired by 0228a5bd581ae6d672ce5f3 in qtwebengine. Change-Id: I80886360d5f7fdaa68a5e5f6fa982137c7187719 Reviewed-by: Leena Miettinen Reviewed-by: Topi Reiniö --- src/imports/qmlwebsockets/qqmlwebsocket.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.cpp') diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index ef97413..07ef925 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -86,9 +86,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} */ /*! -- cgit v1.2.1