diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2017-10-26 15:11:20 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-02-02 09:57:01 +0000 |
| commit | 0cc07329495a05fc5f8532c4420bd23db662fdb6 (patch) | |
| tree | 6dc317f9509ed71304e57051e6da85ca66f1a072 /src/webenginewidgets | |
| parent | 28c9385ab3568361a53a4ea1559c1b971a44d50d (diff) | |
Expose JavascriptCanPaste attribute
Expose an attribute to enable the execCommand("paste") functionality,
which is by default disabled due to security concerns.
[ChangeLog][General] Added JavaScriptCanPaste attribute that
enables JavaScript 'execCommand("paste")'.
Task-number: QTBUG-64056
Change-Id: I1a414021e020473dd15946fff91fb103d871e961
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index b829c5799..32f9b75cd 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -105,6 +105,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::PlaybackRequiresUserGesture; case QWebEngineSettings::WebRTCPublicInterfacesOnly: return WebEngineSettings::WebRTCPublicInterfacesOnly; + case QWebEngineSettings::JavascriptCanPaste: + return WebEngineSettings::JavascriptCanPaste; default: return WebEngineSettings::UnsupportedInCoreSettings; diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 81b6c2937..1815396b6 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -94,6 +94,7 @@ public: ShowScrollBars, PlaybackRequiresUserGesture, WebRTCPublicInterfacesOnly, + JavascriptCanPaste, }; enum FontSize { diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index cde26f66b..a8ee59bf4 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -94,6 +94,8 @@ \value JavascriptCanAccessClipboard 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. + See JavascriptCanPaste to also allow pasting the content of the clipboard content from + JavaScript. Disabled by default. \value LinksIncludedInFocusChain Includes hyperlinks in the keyboard focus chain. Enabled by default. @@ -173,6 +175,9 @@ Inhibits playback of media content until the user interacts with the page. This is similar to how Chrome on Android behaves, while the default behavior when it is disabled is similar to Chrome on desktops. + \value JavascriptCanPaste + Enables JavaScript \c{execCommand("paste")}. This also requires + enabling JavascriptCanAccessClipboard. Disabled by default. (Added in Qt 5.11) \value WebRTCPublicInterfacesOnly Limits WebRTC to public IP addresses only. When disabled WebRTC may also use |