summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-09-08 15:50:31 +0200
committerKai Koehne <kai.koehne@qt.io>2016-10-04 12:40:22 +0000
commit0a336d5110cdc677768f9f50151ee77663cfe6c3 (patch)
treedb8c99b6b0c9a9c0ba3a95de7242876f355588c6 /src/webengine
parent33348994de656361942456834ac0c719ff5d87b8 (diff)
Doc: Do not call Greasemonkey attributes 'extensions'
The term stems from Chromium extensions, which are however overloaded. Sadly there's no good page we can link to inside Chrome/Chromium for the attributes we support ... Change-Id: Ife7fcdba7bdfdbd4b7248b247c4baa188a44867a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp4
-rw-r--r--src/webengine/doc/src/external-resources.qdoc5
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc4
3 files changed, 9 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index f02ba3702..5d5173144 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -65,8 +65,8 @@ using QtWebEngineCore::UserScript;
not accessible from a different one. The worldId property provides some predefined IDs for this
purpose.
- The following Chromium extensions are supported since Qt 5.8: \c @exclude, \c @include,
- \c @name, \c @match, and \c @run-at.
+ The following \l Greasemonkey attributes are supported since Qt 5.8:
+ \c @exclude, \c @include, \c @name, \c @match, and \c @run-at.
Use \l{WebEngineView::userScripts}{WebEngineView.userScripts} to access a list of scripts
attached to the web view.
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc
index 16f1790cf..0d9f80c16 100644
--- a/src/webengine/doc/src/external-resources.qdoc
+++ b/src/webengine/doc/src/external-resources.qdoc
@@ -121,3 +121,8 @@
\externalpage https://www.iana.org/assignments/uri-schemes/prov/view-source
\title view-source URI scheme
*/
+
+/*!
+ \externalpage https://wiki.greasespot.net/Metadata_Block
+ \title Greasemonkey
+*/
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index d7c8ab630..d5b7d40a0 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -181,8 +181,8 @@
script to run, the injection point, and the world where the script is run. This enables
accessing the DOM to manipulate it within a world.
- The following Chromium extensions are supported since Qt 5.8: \c @exclude, \c @include,
- \c @name, \c @match, and \c @run-at.
+ The following \l Greasemonkey attributes are supported since Qt 5.8:
+ \c @exclude, \c @include, \c @name, \c @match, and \c @run-at.
\section1 Managing Certificates