summaryrefslogtreecommitdiff
path: root/src/webengine/api/qquickwebenginescript.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-18 14:45:04 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-09-18 14:45:13 +0200
commit66f69a2052573af086fc5e0286e6af5ccaa80d97 (patch)
tree25056d484013efbbbb3eb1a78ad6a6449b671578 /src/webengine/api/qquickwebenginescript.cpp
parentb74e93a9b07243da4f3d2784cde49916de455364 (diff)
parentd74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (diff)
downloadqtwebengine-66f69a2052573af086fc5e0286e6af5ccaa80d97.tar.gz
Merge branch '5.12' into dev
Change-Id: Icf2b740cb1eb2810beab98ff705e0bb59625f55e
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index acc5cedb7..ab7aee4cb 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -86,7 +86,8 @@ QT_BEGIN_NAMESPACE
/*!
\enum QQuickWebEngineScript::ScriptWorldId
- The world ID defining which isolated world the script is executed in.
+ The world ID defining which isolated world the script is executed in. Besides these predefined
+ IDs custom IDs can be used, but must be integers between \c 0 and \c 256.
\value MainWorld
The world used by the page's web contents. It can be useful in order to expose custom