aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-10 16:27:39 +0100
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-11 21:59:19 +0000
commit3e40bbd114fcb81c3ec173ba26955f13a24f05f6 (patch)
tree913c969309bb93b7dc062f34f81e6dc4f50d6f1c
parentf36d7e5d9b720bb8ccc38e686821ef7e96272221 (diff)
QtWebEngine: add dependency on QtWebChannel
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>
-rw-r--r--qt.pro2
m---------qtwebengine0
2 files changed, 1 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index f044bd8e..e598b18f 100644
--- 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)
diff --git a/qtwebengine b/qtwebengine
-Subproject 372c81255a25fe6f81fb134b081d5f187ce8986
+Subproject cd307cdb7d4dfbdaf7c9e7a81f9c39e47790962