diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-11 11:55:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-11 15:37:35 +0000 |
| commit | c27374541e289962df6947967b97178bfa63e9f7 (patch) | |
| tree | 2f4254eb30b9c5c3eef8ac9f770ddf26c6a5d992 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | e70b59112104b72e794c20f7c715482809780d32 (diff) | |
| parent | 39f7ce19dbce34dfa7e730d6fa743d88109c3369 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -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 1004b3e92..ca160c362 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -333,6 +333,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; } |