summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules33
-rwxr-xr-xinit-repository2
m---------qlalr0
-rw-r--r--qt.pro15
m---------qt3d0
m---------qtconnectivity0
m---------qtdocgallery0
m---------qtfeedback0
m---------qtjsondb0
m---------qtlocation0
m---------qtpim0
m---------qtsensors0
m---------qtsystems0
m---------qtwayland0
14 files changed, 48 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 4f09c921..7d1c81e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,9 @@
[submodule "qtdoc"]
path = qtdoc
url = git://gitorious.org/qt/qtdoc.git
+[submodule "qlalr"]
+ path = qlalr
+ url = git://gitorious.org/qt/qlalr.git
[submodule "qtrepotools"]
path = qtrepotools
url = git://gitorious.org/qt/qtrepotools.git
@@ -40,6 +43,36 @@
[submodule "qtqa"]
path = qtqa
url = git://gitorious.org/qt/qtqa.git
+[submodule "qtlocation"]
+ path = qtlocation
+ url = git://gitorious.org/qt/qtlocation.git
+[submodule "qtsensors"]
+ path = qtsensors
+ url = git://gitorious.org/qt/qtsensors.git
+[submodule "qtsystems"]
+ path = qtsystems
+ url = git://gitorious.org/qt/qtsystems.git
+[submodule "qtfeedback"]
+ path = qtfeedback
+ url = git://gitorious.org/qt/qtfeedback.git
+[submodule "qtdocgallery"]
+ path = qtdocgallery
+ url = git://gitorious.org/qt/qtdocgallery.git
+[submodule "qtpim"]
+ path = qtpim
+ url = git://gitorious.org/qt/qtpim.git
+[submodule "qtconnectivity"]
+ path = qtconnectivity
+ url = git://gitorious.org/qt/qtconnectivity.git
+[submodule "qtwayland"]
+ path = qtwayland
+ url = git://gitorious.org/qt/qtwayland.git
+[submodule "qtjsondb"]
+ path = qtjsondb
+ url = git://gitorious.org/qt/qtjsondb.git
+[submodule "qt3d"]
+ path = qt3d
+ url = git://gitorious.org/qt/qt3d.git
[submodule "qtjsbackend"]
path = qtjsbackend
url = git://gitorious.org/qt/qtjsbackend.git
diff --git a/init-repository b/init-repository
index bd9fa038..a89abbff 100755
--- a/init-repository
+++ b/init-repository
@@ -219,9 +219,11 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtconnectivity
qtdeclarative
qtdoc
+ qtdocgallery
qtfeedback
qtgraphicaleffects
qtimageformats
+ qtjsondb
qtjsbackend
qtlocation
qtmultimedia
diff --git a/qlalr b/qlalr
new file mode 160000
+Subproject d7064c2c7dfb36646811d2aefd097a8de941989
diff --git a/qt.pro b/qt.pro
index 91151678..7d1a78b8 100644
--- a/qt.pro
+++ b/qt.pro
@@ -50,19 +50,30 @@ defineTest(addModule) {
# it may not build.
addModule(qtbase)
+addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtjsbackend, qtbase)
addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
-addModule(qtmultimedia, qtbase, qtdeclarative)
+addModule(qtmultimedia, qtdeclarative)
addModule(qtactiveqt, qtbase)
-addModule(qtwebkit, qtdeclarative, , WebKit.pro)
+addModule(qt3d, qtdeclarative)
+addModule(qtjsondb, qtdeclarative)
+addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+addModule(qtsensors, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtsystems)
+addModule(qtfeedback, qtdeclarative, qtmultimedia)
+addModule(qtpim, qtdeclarative, qtjsondb)
+addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples-and-demos, qtwebkit qttools)
addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
+addModule(qtdocgallery, qtdeclarative, qtjsondb)
+!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)
diff --git a/qt3d b/qt3d
new file mode 160000
+Subproject 6b8ee028ac0daae74f5521b9e5562f94b5e8e16
diff --git a/qtconnectivity b/qtconnectivity
new file mode 160000
+Subproject fee6b50154d583422e6505a60a7d44d726785ab
diff --git a/qtdocgallery b/qtdocgallery
new file mode 160000
+Subproject f3fa41d4a98f49be8991f615d6d720779a2b585
diff --git a/qtfeedback b/qtfeedback
new file mode 160000
+Subproject 0d85e95a06ac6b5abbbf6715ae66c1e7109d639
diff --git a/qtjsondb b/qtjsondb
new file mode 160000
+Subproject 3b693a54e53b6378af23a348ff74bb9d0728f96
diff --git a/qtlocation b/qtlocation
new file mode 160000
+Subproject fd330db9e5631438f86e0fae52aea5454519d19
diff --git a/qtpim b/qtpim
new file mode 160000
+Subproject 099111a9fbaf31e954ca91a18d47272590f60ea
diff --git a/qtsensors b/qtsensors
new file mode 160000
+Subproject b550c4980cf874ce84419a86c933c32504b9b19
diff --git a/qtsystems b/qtsystems
new file mode 160000
+Subproject 620592b4bc2fb4f92cfbd6f09eeafb31b30cb94
diff --git a/qtwayland b/qtwayland
new file mode 160000
+Subproject 7334963a7911f5e8cfc18d6a21876bb9c16f1ab