From a7dc6fd595f51dcbb8a8c8b2c06a9db64bfa214e Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 24 Oct 2013 12:30:47 +0200 Subject: [PATCH] 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 Reviewed-by: Kurt Pattyn Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- .gitmodules | 3 +++ init-repository | 2 ++ qt.pro | 1 + qtwebsockets | 1 + 4 files changed, 7 insertions(+) create mode 160000 qtwebsockets 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 diff --git a/qt.pro b/qt.pro index 426cc871..d0edc030 100644 --- a/qt.pro +++ b/qt.pro @@ -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 index 00000000..1edb9b0d --- /dev/null +++ b/qtwebsockets @@ -0,0 +1 @@ +Subproject commit 1edb9b0d43d9ad688fb21f93f04922ab4542f760