diff options
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 5 | ||||
| -rw-r--r-- | sync.profile | 16 |
2 files changed, 5 insertions, 16 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; } diff --git a/sync.profile b/sync.profile index e4a88e0c2..4cc549106 100644 --- a/sync.profile +++ b/sync.profile @@ -10,19 +10,3 @@ ); %classnames = ( ); - -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# -%dependencies = ( - "qtbase" => "", - "qtdeclarative" => "", - "qtlocation" => "", - "qttools" => "", -# FIXME: take examples out into their own module to avoid a potential circular dependency later ? - "qtquickcontrols" => "", - "qtwebchannel" => "", -); |