summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-10 10:28:28 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-10 10:28:28 +0100
commit95621e44c4234872aaa827885c5ffedee4e73807 (patch)
tree83a82619c1e729b65ada1782d487329cd3645dd4 /src/webengine
parent9748862ee843b371b795fbf5b1a5b476e30ed402 (diff)
parent2d641398008ce8d58bb257f32e10914cd564405e (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebenginesettings.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 8a3c6c24f..ff2541376 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.
*/