Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I454bb7216b013cc9aa9ee660893fe37034fd50e1

1 files changed, 2 insertions, 0 deletions

diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index 2a789ef91..d16c2bd15 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -297,6 +297,7 @@ void WebEngineSettings::initDefaults()
             playbackRequiresUserGesture = (commandLine->GetSwitchValueASCII(switches::kAutoplayPolicy) != switches::autoplay::kNoUserGestureRequiredPolicy);
         s_defaultAttributes.insert(PlaybackRequiresUserGesture, playbackRequiresUserGesture);
         s_defaultAttributes.insert(WebRTCPublicInterfacesOnly, false);
+        s_defaultAttributes.insert(JavascriptCanPaste, false);
     }
 
     if (s_defaultFontFamilies.isEmpty()) {
@@ -388,6 +389,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
                                ? content::AutoplayPolicy::kUserGestureRequired
                                : content::AutoplayPolicy::kNoUserGestureRequired;
     }
+    prefs->dom_paste_enabled = testAttribute(JavascriptCanPaste);
 
     // Fonts settings.
     prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont));