From 3e40bbd114fcb81c3ec173ba26955f13a24f05f6 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 10 Feb 2015 16:27:39 +0100 Subject: [PATCH] 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 --- qt.pro | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 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 index 372c8125..cd307cdb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 372c81255a25fe6f81fb134b081d5f187ce89868 +Subproject commit cd307cdb7d4dfbdaf7c9e7a81f9c39e477909621