diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /src/webengine/api/qquickwebenginescript.cpp | |
parent | 6534b09073791398bad99863821740e986915bff (diff) | |
parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
-rw-r--r-- | src/webengine/api/qquickwebenginescript.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index 8802a40f6..a1c903df3 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -159,13 +159,13 @@ ASSERT_ENUMS_MATCH(QQuickWebEngineScript::DocumentCreation, UserScript::Document The point in the loading process at which the script will be executed. The default value is \c Deferred. - \value DocumentCreation + \value WebEngineScript.DocumentCreation The script will be executed as soon as the document is created. This is not suitable for any DOM operation. - \value DocumentReady + \value WebEngineScript.DocumentReady The script will run as soon as the DOM is ready. This is equivalent to the \c DOMContentLoaded event firing in JavaScript. - \value Deferred + \value WebEngineScript.Deferred The script will run when the page load finishes, or 500 ms after the document is ready, whichever comes first. */ @@ -180,13 +180,13 @@ QQuickWebEngineScript::InjectionPoint QQuickWebEngineScript::injectionPoint() co The world ID defining which isolated world the script is executed in. - \value MainWorld + \value WebEngineScript.MainWorld The world used by the page's web contents. It can be useful in order to expose custom functionality to web contents in certain scenarios. - \value ApplicationWorld + \value WebEngineScript.ApplicationWorld The default isolated world used for application level functionality implemented in JavaScript. - \value UserWorld + \value WebEngineScript.UserWorld The first isolated world to be used by scripts set by users if the application is not making use of more worlds. As a rule of thumb, if that functionality is exposed to the application users, each individual script should probably get its own isolated world. |