diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-02-27 20:34:27 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-07 22:56:29 +0000 |
| commit | 2d641398008ce8d58bb257f32e10914cd564405e (patch) | |
| tree | c83b97e21eee89e9b3c9540eb10d4a101e013579 | |
| parent | 37fac8e46cd77edc9fab4ebf29cb7ab3b529135d (diff) | |
Clarify JavascriptCanAccessClipboard documentation
Chromium always allows copying to clipboard (even when this is disabled) if it's
resulting from an user interaction.
Change-Id: I0363b892fef6ce015a2f8ae9b89423e1655b516c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index c9eb9d342..fd89e3916 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -112,6 +112,7 @@ bool QQuickWebEngineSettings::javascriptCanOpenWindows() const \qmlproperty bool WebEngineSettings::javascriptCanAccessClipboard Allows JavaScript programs to read from or write to the clipboard. + Writing to the clipboard is always allowed if it is specifically requested by the user. Disabled by default. */ diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 07afd6501..5d01f331e 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 |