summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api/qwebenginescriptcollection.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-08-11 10:57:50 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-11 10:57:50 +0200
commitd41f0bed7ddbdacb4f6444a84773a029e46988f3 (patch)
tree15a68979470278f0c13b2521cb614d5670288271 /src/webenginewidgets/api/qwebenginescriptcollection.cpp
parent0caabd54a24ffa3a2d2de5cb6f1fce2af3588eb7 (diff)
parenta2c365cb1f22431845380159c29048da76c2b2a9 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: src/3rdparty Change-Id: I64b46801bbaac4e96e32fece30f24f1d6cfc97a4
Diffstat (limited to 'src/webenginewidgets/api/qwebenginescriptcollection.cpp')
-rw-r--r--src/webenginewidgets/api/qwebenginescriptcollection.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.cpp b/src/webenginewidgets/api/qwebenginescriptcollection.cpp
index 5ef0ffd44..8cbeeb804 100644
--- a/src/webenginewidgets/api/qwebenginescriptcollection.cpp
+++ b/src/webenginewidgets/api/qwebenginescriptcollection.cpp
@@ -55,6 +55,8 @@ using QtWebEngineCore::UserScript;
Use QWebEnginePage::scripts() and QWebEngineProfile::scripts() to access
the collection of scripts associated with a single page or a
number of pages sharing the same profile.
+
+ \sa {Script Injection}
*/
/*!