Merge remote-tracking branch 'origin/5.6' into 5.7

Needed to update QWebEnginePagePrivate to match modified
WebContentsAdapter API in 5.7.

Conflicts:
    src/webenginewidgets/api/qwebenginepage.cpp

Change-Id: If3da3b4db9dc27e5d6aae1e31a4e7b45c435697e

1 files changed, 5 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index aad8ba058..df4031712 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -331,6 +331,11 @@ void QWebEnginePagePrivate::adoptNewWindowImpl(QWebEnginePage *newPage,
     if (!initialGeometry.isEmpty())
         emit newPage->geometryChangeRequested(initialGeometry);
 
+    // If the constructor of the QWebEnginePage descendant set a web channel,
+    // set it on the new adapter.
+    newWebContents->setWebChannel(newPage->d_func()->webChannel
+                                  , newPage->d_func()->webChannelWorldId);
+
     // Page has finished the adoption process.
     newPage->d_func()->m_isBeingAdopted = false;
 }