diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
| commit | c9a64fda178c32ac924977ac93bf83d7e47767fe (patch) | |
| tree | beaf8671ccbce36b3d4018ce57fe9de29d40d87f /src/webengine/doc/src/external-resources.qdoc | |
| parent | 10611866af8736a397371a38d6b5486ee8d28c62 (diff) | |
| parent | 44303861fd116b3a279d26300147e89a0bf8121c (diff) | |
Merge branch '5.12' into 5.13
Conflicts:
src/3rdparty
src/core/renderer/user_resource_controller.cpp
src/core/web_contents_adapter.cpp
src/webengine/doc/src/qtwebengine-overview.qdoc
Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
Diffstat (limited to 'src/webengine/doc/src/external-resources.qdoc')
| -rw-r--r-- | src/webengine/doc/src/external-resources.qdoc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc index e4fe9bba6..55f6a68a3 100644 --- a/src/webengine/doc/src/external-resources.qdoc +++ b/src/webengine/doc/src/external-resources.qdoc @@ -95,18 +95,6 @@ \title Hunspell Project */ -/* - This prevents autolinking of each occurrence of 'WebEngine' - To link to the WebEngine QML type, use explicit linking: - \l [QML] WebEngine - \sa {QtWebEngine::}{WebEngine} -*/ -/*! - \externalpage nolink - \title WebEngine - \internal -*/ - /*! \externalpage https://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1 \title RFC 2616 section 19.5.1 |