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

Change-Id: I9b1f2a0317290f0855da03eca9d26878b7faeb0a

1 files changed, 0 insertions, 11 deletions

diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index a8c390c41..8a3757838 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -526,17 +526,6 @@ void WebContentsDelegateQt::ActivateContents(content::WebContents* contents)
         contents->Focus();
 }
 
-void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *old_host, content::RenderViewHost *new_host)
-{
-    Q_ASSERT(new_host);
-
-    // The old RVH can be nullptr if it was shut down.
-    if (!old_host)
-        return;
-
-    new_host->UpdateWebkitPreferences(old_host->GetWebkitPreferences());
-}
-
 void WebContentsDelegateQt::RequestToLockMouse(content::WebContents *web_contents, bool user_gesture, bool last_unlocked_by_target)
 {
     Q_UNUSED(user_gesture);