diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:14:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:14:49 +0200 |
| commit | 53df50a08fa68e85afea5ed02326eb8616fa1ee9 (patch) | |
| tree | 3b0302d7c1ef0929992192db9effc2c1c6f119c2 /src/webengine/api/qquickwebenginescript.cpp | |
| parent | d4ef262a9e84f73c7bd211c843b8094eb4863a17 (diff) | |
| parent | 6426f1e93622cb08a2286705398e7762cbcd0a45 (diff) | |
| download | qtwebengine-53df50a08fa68e85afea5ed02326eb8616fa1ee9.tar.gz | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Idee34fa6d4cc54effd84d3b78e3666fa7fcce8db
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginescript.cpp | 3 |
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 |