From 0a336d5110cdc677768f9f50151ee77663cfe6c3 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Thu, 8 Sep 2016 15:50:31 +0200
Subject: [PATCH] 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>
---
src/webengine/api/qquickwebenginescript.cpp | 4 ++--
src/webengine/doc/src/external-resources.qdoc | 5 +++++
src/webengine/doc/src/qtwebengine-overview.qdoc | 4 ++--
src/webenginewidgets/api/qwebenginescript.cpp | 4 ++--
4 files changed, 11 insertions(+), 6 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
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index b434126bc..04a9d979a 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -61,8 +61,8 @@ using QtWebEngineCore::UserScript;
not accessible from a different one. ScriptWorldId 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 QWebEnginePage::scripts() and QWebEngineProfile::scripts() to access
the collection of scripts associated with a single page or a
--
GitLab