diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:08:31 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-08-08 19:50:01 +0200 |
commit | 9677483cdc6550871c4db9de97ee72dbe239c40f (patch) | |
tree | 02c39af7f7a3e38ec4e909ac71e3567bd579be72 | |
parent | e073b25926d4c538cb9f41d4c59d171857a60ede (diff) |
Add qtwebchannel as submodule
This also updates the qtwebsockets revision since
that's needed to compile.
Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
-rw-r--r-- | .gitmodules | 3 | ||||
-rwxr-xr-x | init-repository | 2 | ||||
-rw-r--r-- | qt.pro | 1 | ||||
m--------- | qtwebchannel | 0 | ||||
m--------- | qtwebsockets | 0 |
5 files changed, 6 insertions, 0 deletions
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 @@ -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 +Subproject c18879b89f770ea8964828587e3ab19c3239372 diff --git a/qtwebsockets b/qtwebsockets -Subproject 389547b491985c16d80b7f9de2da972373d7a2f +Subproject 03933809bbc65c6073d7d3a1709e7c1c31758e2 |