From 57e447f19afb9fa58add302547c966e6f5c3b16f Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 2 Jul 2020 15:07:57 +0200 Subject: Doc: Remove 'nolink' hack for WebSockets This was used for preventing unwanted auto-links. We have since introduced a different mechanism to handle these (the 'ignorewords' qdocconf variable), and this workaround now causes problems. Fixes: QTBUG-85388 Change-Id: Ife6183accf46a3b47f2dc6c988e40cf8f9f24e49 Reviewed-by: Paul Wicking (cherry picked from commit 4b8f290571d1e3a2f291a07796e0cd4ac2745f74) Reviewed-by: Qt Cherry-pick Bot --- src/websockets/doc/src/external-resources.qdoc | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc index ce39b9b..1363d24 100644 --- a/src/websockets/doc/src/external-resources.qdoc +++ b/src/websockets/doc/src/external-resources.qdoc @@ -104,24 +104,3 @@ \externalpage https://bugzilla.mozilla.org/show_bug.cgi?id=594502 \title Firefox bug 594502 */ - -/* - This prevents autolinking of each occurrence of 'WebSocket' - To link to the WebSocket QML type, use explicit linking: - \l [QML] WebSocket - \sa {QtWebSockets::}{WebSocket} -*/ -/*! - \externalpage nolink - \title WebSocket - \internal -*/ - -/* - Prevent linking to WebSockets section in "Networking and Connectivity" -*/ -/*! - \externalpage nolink - \title WebSockets - \internal -*/ -- cgit v1.2.1