From 2d641398008ce8d58bb257f32e10914cd564405e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 27 Feb 2017 20:34:27 +0100 Subject: 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 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginesettings.cpp | 1 + src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.1