From eab2f568d80b870db07ad8e0cec352fa655a6eb8 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 3 Nov 2016 18:25:19 +0100
Subject: remove dependencies from sync.profile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the CI obtains them from the qt5 super repo nowadays.

Change-Id: If41f7c5306ca739fd3800cec3f680fa72df2a871
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 sync.profile | 16 ----------------
 1 file changed, 16 deletions(-)

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" => "",
-);
-- 
cgit v1.2.3


From ff26fa899f095eff9b3265b462e97c7e48ab06f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Wed, 26 Oct 2016 14:56:56 +0200
Subject: 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>
---
 src/webenginewidgets/api/qwebenginepage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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;
 }
-- 
cgit v1.2.3