Merge "Merge branch 'stable' into dev" into refs/staging/dev

.commit-template

@@ -6,15 +6,15 @@
 
 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
+# Change log entry (see below for instructions).
+#[ChangeLog][][]
+#
 # One task per entry. Remember space after colon.
 #Task-number: 
 #
 # Solicit reviewers. They still need to use the Gerrit frontend.
 #Reviewed-by: 
 #
-# Change log entry (see below for instructions).
-#[ChangeLog][][]
-#
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt-project.org/Commit_Policy

.gitignore

@@ -1,2 +1,3 @@
 Makefile
 .qmake.cache
+.qmake.super

.gitmodules

@@ -97,3 +97,6 @@
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
+[submodule "qtandroidextras"]
+	path = qtandroidextras
+	url = ../qtandroidextras.git

init-repository

@@ -202,6 +202,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt5
     qlalr
     qtactiveqt
+    qtandroidextras
     qtbase
     qtconnectivity
     qtdeclarative
@@ -236,12 +237,14 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
 
 my @DEFAULT_REPOS = qw(
     qtactiveqt
+    qtandroidextras
     qtbase
     qtconnectivity
     qtdeclarative
     qtdoc
     qtgraphicaleffects
     qtimageformats
+    qtmacextras
     qtmultimedia
     qtqa
     qtquick1

qt.pro

@@ -54,22 +54,23 @@ defineTest(addModule) {
 # it may not build.
 
 addModule(qtbase)
+addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
 addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtwinextras, qtbase, qtdeclarative)
 addModule(qtquickcontrols, qtdeclarative)
 addModule(qtmultimedia, qtdeclarative)
+addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qt3d, qtdeclarative)
 addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
+addModule(qtconnectivity, qtbase, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)