diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2016-10-26 14:56:56 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2016-11-08 10:06:18 +0000 |
| commit | ff26fa899f095eff9b3265b462e97c7e48ab06f5 (patch) | |
| tree | 1a899fe1ce355549dd5019d717dd2f1f8118c7c6 /src | |
| parent | eab2f568d80b870db07ad8e0cec352fa655a6eb8 (diff) | |
Copy web channel from QWebEnginePage when adopting WebContentsAdapter
It used to be just ignored.
Task-number: QTBUG-56643
Change-Id: Ife7ac05fce7e93a6eba1ac6e6db1095574c83e42
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 3642a9bf5..df96f4c17 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -313,6 +313,10 @@ 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); + // Page has finished the adoption process. newPage->d_func()->m_isBeingAdopted = false; } |