From 9677483cdc6550871c4db9de97ee72dbe239c40f Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 22 Jul 2014 20:08:31 +0200 Subject: Add qtwebchannel as submodule This also updates the qtwebsockets revision since that's needed to compile. Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502 Reviewed-by: Milian Wolff --- .gitmodules | 3 +++ init-repository | 2 ++ qt.pro | 1 + qtwebchannel | 1 + qtwebsockets | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 qtwebchannel diff --git a/.gitmodules b/.gitmodules index 0d6fb1aa..66b86f89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,6 @@ [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git +[submodule "qtwebchannel"] + path = qtwebchannel + url = ../qtwebchannel.git diff --git a/init-repository b/init-repository index b38a07e9..faef7f00 100755 --- a/init-repository +++ b/init-repository @@ -234,6 +234,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qttools qttranslations qtwayland + qtwebchannel qtwebkit qtwebkit-examples qtwebsockets @@ -265,6 +266,7 @@ my @DEFAULT_REPOS = qw( qtsvg qttools qttranslations + qtwebchannel qtwebsockets qtwebkit qtwebkit-examples diff --git a/qt.pro b/qt.pro index df891f55..c10c7378 100644 --- a/qt.pro +++ b/qt.pro @@ -88,6 +88,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) addModule(qtwebsockets, qtbase, qtdeclarative) +addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtwebchannel b/qtwebchannel new file mode 160000 index 00000000..c18879b8 --- /dev/null +++ b/qtwebchannel @@ -0,0 +1 @@ +Subproject commit c18879b89f770ea8964828587e3ab19c32393720 diff --git a/qtwebsockets b/qtwebsockets index 389547b4..03933809 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 389547b491985c16d80b7f9de2da972373d7a2f4 +Subproject commit 03933809bbc65c6073d7d3a1709e7c1c31758e27 -- cgit v1.2.3