QtWebEngine: add dependency on QtWebChannel dev_1423693106 54/105854/3
authorPierre Rossi <pierre.rossi@theqtcompany.com>
Tue, 10 Feb 2015 15:27:39 +0000 (16:27 +0100)
committerPierre Rossi <pierre.rossi@theqtcompany.com>
Wed, 11 Feb 2015 21:59:19 +0000 (21:59 +0000)
To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1

Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
qt.pro
qtwebengine

diff --git a/qt.pro b/qt.pro
index f044bd8..e598b18 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -88,7 +88,7 @@ addModule(qtdocgallery, qtdeclarative)
 linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols, qtwebkit)
+addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)
index 372c812..cd307cd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 372c81255a25fe6f81fb134b081d5f187ce89868
+Subproject commit cd307cdb7d4dfbdaf7c9e7a81f9c39e477909621