Merge remote-tracking branch 'gerrit/dev' into stable

Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c

4 files changed, 10 insertions, 1 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
diff --git a/qt.pro b/qt.pro
index f9344690..d0edc030 100644
--- a/qt.pro
+++ b/qt.pro
@@ -54,6 +54,9 @@ defineTest(addModule) {
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.
 
+ANDROID_EXTRAS =
+android: ANDROID_EXTRAS = qtandroidextras
+
 addModule(qtbase)
 addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
@@ -71,7 +74,7 @@ addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
@@ -85,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