Merge branch 'stable' into dev

Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtxmlpatterns

Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1

.gitmodules

@@ -94,3 +94,9 @@
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
+[submodule "qtmacextras"]
+	path = qtmacextras
+	url = ../qtmacextras.git
+[submodule "qtwinextras"]
+	path = qtwinextras
+	url = ../qtwinextras.git

configure

@@ -53,11 +53,5 @@ mkdir -p qtbase || exit
 echo "+ cd qtbase"
 cd qtbase || exit
 
-echo "+ $configure $@"
-"$configure" "$@" || exit 1
-
-echo "+ cd .."
-cd ..
-
-echo "+ qtbase/bin/qmake $srcpath"
-exec qtbase/bin/qmake "$srcpath"
+echo "+ $configure -top-level $@"
+exec "$configure" -top-level "$@"

configure.bat

@@ -52,17 +52,10 @@ if not exist qtbase mkdir qtbase || exit /b 1
 echo + cd qtbase
 cd qtbase || exit /b 1
 
-echo + %configure% %*
-call %configure% %*
+echo + %configure% -top-level %*
+call %configure% -top-level %*
 set err=%errorlevel%
 
 cd ..
 
-if not %err% == 0 goto out
-
-echo + qtbase\bin\qmake %srcpath%
-qtbase\bin\qmake %srcpath%
-set err=%errorlevel%
-
-:out
 exit /b %err%

init-repository

@@ -226,6 +226,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtjsondb
     qtjsbackend
     qtlocation
+    qtmacextras
     qtmultimedia
     qtpim
     qtqa
@@ -242,6 +243,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
+    qtwinextras
     qtx11extras
     qtxmlpatterns
 );

qt.pro

@@ -54,6 +54,8 @@ defineTest(addModule) {
 # it may not build.
 
 addModule(qtbase)
+addModule(qtmacextras, qtbase)
+addModule(qtwinextras, qtbase)
 addModule(qtx11extras, qtbase)
 addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)