diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:30:47 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 06:32:17 +0100 |
commit | a7dc6fd595f51dcbb8a8c8b2c06a9db64bfa214e (patch) | |
tree | eae2384e199a132443d2ef0b9274dc2ba0de0132 | |
parent | b2385231c40547a3d6de2acaad978a2f5700ed36 (diff) |
Add qtwebsockets as submodule
This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that
Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r-- | .gitmodules | 3 | ||||
-rwxr-xr-x | init-repository | 2 | ||||
-rw-r--r-- | qt.pro | 1 | ||||
m--------- | qtwebsockets | 0 |
4 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 4a1c3d05..f1b10395 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,6 @@ [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git +[submodule "qtwebsockets"] + path = qtwebsockets + url = ../qtwebsockets.git diff --git a/init-repository b/init-repository index 272193d8..8ad799ad 100755 --- a/init-repository +++ b/init-repository @@ -231,6 +231,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtwayland qtwebkit qtwebkit-examples + qtwebsockets qtwinextras qtx11extras qtxmlpatterns @@ -258,6 +259,7 @@ my @DEFAULT_REPOS = qw( qtsvg qttools qttranslations + qtwebsockets qtwebkit qtwebkit-examples qtwinextras @@ -88,6 +88,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) +addModule(qtwebsockets, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtwebsockets b/qtwebsockets new file mode 160000 +Subproject 1edb9b0d43d9ad688fb21f93f04922ab4542f76 |