diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2016-11-09 10:45:15 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2016-11-09 10:44:18 +0000 |
commit | dd80dd0e4efcdfcc33f71a4f964aa9d2d40c4af0 (patch) | |
tree | a28af35f72ddb05ade66551d9196b9f4916cbf50 /src | |
parent | 1666e7bbdc6f9bdcaeb257d4d46e29a3e326a9e0 (diff) | |
parent | ff26fa899f095eff9b3265b462e97c7e48ab06f5 (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 5 |
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; } |