diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:28 +0100 |
| commit | 95621e44c4234872aaa827885c5ffedee4e73807 (patch) | |
| tree | 83a82619c1e729b65ada1782d487329cd3645dd4 /src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | |
| parent | 9748862ee843b371b795fbf5b1a5b476e30ed402 (diff) | |
| parent | 2d641398008ce8d58bb257f32e10914cd564405e (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I6a39d1ec0ffc0394fbb472ab1df2963ed5c69ec7
Diffstat (limited to 'src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 1919d6ea7..efbeb1991 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -96,8 +96,9 @@ Allows JavaScript programs to open popup windows without user interaction. Enabled by default. \value JavascriptCanAccessClipboard - Allows JavaScript programs to read from and write to the clipboard. Disabled by - default. + Allows JavaScript programs to read from and write to the clipboard. + Writing to the clipboard is always allowed if it is specifically requested by the user. + Disabled by default. \value LinksIncludedInFocusChain Includes hyperlinks in the keyboard focus chain. Enabled by default. \value LocalStorageEnabled |