Merge branch 'dev' into stable

Conflicts:
	qtjsbackend

.gitmodules

@@ -73,9 +73,6 @@
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-[submodule "qtjsbackend"]
-	path = qtjsbackend
-	url = ../qtjsbackend.git
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git

init-repository

@@ -211,7 +211,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtgraphicaleffects
     qtimageformats
     qtjsondb
-    qtjsbackend
     qtlocation
     qtmacextras
     qtmultimedia
@@ -238,15 +237,16 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
 my @DEFAULT_REPOS = qw(
     qtactiveqt
     qtbase
+    qtconnectivity
     qtdeclarative
     qtdoc
     qtgraphicaleffects
     qtimageformats
-    qtjsbackend
     qtmultimedia
     qtqa
     qtquick1
     qtquickcontrols
+    qtlocation
     qtrepotools
     qtscript
     qtsensors
@@ -256,6 +256,7 @@ my @DEFAULT_REPOS = qw(
     qttranslations
     qtwebkit
     qtwebkit-examples
+    qtwinextras
     qtx11extras
     qtxmlpatterns
 );

qt.pro

@@ -59,16 +59,15 @@ addModule(qtx11extras, qtbase)
 addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
-addModule(qtjsbackend, qtbase)
+addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
 addModule(qtwinextras, qtbase, qtdeclarative)
 addModule(qtquickcontrols, qtdeclarative)
 addModule(qtmultimedia, qtdeclarative)
 addModule(qtactiveqt, qtbase)
 addModule(qt3d, qtdeclarative)
 addModule(qtjsondb, qtdeclarative)
-addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+addModule(qtsystems, qtbase, qtdeclarative)
-addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtsystems)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)