diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
| commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
| tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/webengine/api/qquickwebenginescript.cpp | |
| parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
| parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) | |
| download | qtwebengine-7978feadee937299798372bced1680f52b4b1842.tar.gz | |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginescript.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index 74bd9899a..8802a40f6 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -65,6 +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. + Use \l{WebEngineView::userScripts}{WebEngineView.userScripts} to access a list of scripts attached to the web view. */ |