Merge branch 'dev' into stable

Conflicts: qtjsbackend
2026-02-01 11:26:04 +08:00 · 2013-09-23 12:24:59 +02:00
parent e39f4e8b4b acd97fec50
commit 433e143b23
23 changed files with 25 additions and 29 deletions
--- a/.gitmodules
+++ b/.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
--- a/5
+++ b/5
@@ -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
 );
--- a/2
+++ b/2
--- a/qt.pro
+++ b/qt.pro
@@ -59,16 +59,15 @@ addModule(qtx11extras, qtbase)
 addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
-addModule(qtjsbackend, qtbase)
-addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
+addModule(qtdeclarative, qtbase, 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(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtsystems, qtbase, qtdeclarative)
+addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtsystems)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2