summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-12 16:15:33 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-25 07:08:44 +0000
commit6d2e62f3d67725310ca4ef23603ca7467ed09878 (patch)
tree091a976195ae203da10be4c0503df5b6ce1ab113 /src
parent822763ddda98f04339df44641f9b0d0f72ff6466 (diff)
Doc: Additional Chromium extensions are supported since Qt 5.8
Task-number: QTBUG-55242 Change-Id: Ia02ffaff1c0c39dc61b4aa73b11f8f9a6f7bc174 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp3
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc3
-rw-r--r--src/webenginewidgets/api/qwebenginescript.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index a1c903df3..b9517ee7c 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -65,7 +65,8 @@ using QtWebEngineCore::UserScript;
not accessible from a different one. The worldId property provides some predefined IDs for this
purpose.
- \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported.
+ The following Chromium extensions 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/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index 6b5ccaa14..d7c8ab630 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -181,7 +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.
- \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported.
+ The following Chromium extensions 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 73dd5075e..b434126bc 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -61,7 +61,8 @@ using QtWebEngineCore::UserScript;
not accessible from a different one. ScriptWorldId provides some predefined IDs for this
purpose.
- \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported.
+ The following Chromium extensions 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