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 index 00000000..d7064c2c --- /dev/null +++ b/qlalr @@ -0,0 +1 @@ +Subproject commit d7064c2c7dfb36646811d2aefd097a8de9419894 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 index 00000000..6b8ee028 --- /dev/null +++ b/qt3d @@ -0,0 +1 @@ +Subproject commit 6b8ee028ac0daae74f5521b9e5562f94b5e8e169 diff --git a/qtconnectivity b/qtconnectivity new file mode 160000 index 00000000..fee6b501 --- /dev/null +++ b/qtconnectivity @@ -0,0 +1 @@ +Subproject commit fee6b50154d583422e6505a60a7d44d726785ab0 diff --git a/qtdocgallery b/qtdocgallery new file mode 160000 index 00000000..f3fa41d4 --- /dev/null +++ b/qtdocgallery @@ -0,0 +1 @@ +Subproject commit f3fa41d4a98f49be8991f615d6d720779a2b5850 diff --git a/qtfeedback b/qtfeedback new file mode 160000 index 00000000..0d85e95a --- /dev/null +++ b/qtfeedback @@ -0,0 +1 @@ +Subproject commit 0d85e95a06ac6b5abbbf6715ae66c1e7109d6392 diff --git a/qtjsondb b/qtjsondb new file mode 160000 index 00000000..3b693a54 --- /dev/null +++ b/qtjsondb @@ -0,0 +1 @@ +Subproject commit 3b693a54e53b6378af23a348ff74bb9d0728f96b diff --git a/qtlocation b/qtlocation new file mode 160000 index 00000000..fd330db9 --- /dev/null +++ b/qtlocation @@ -0,0 +1 @@ +Subproject commit fd330db9e5631438f86e0fae52aea5454519d196 diff --git a/qtpim b/qtpim new file mode 160000 index 00000000..099111a9 --- /dev/null +++ b/qtpim @@ -0,0 +1 @@ +Subproject commit 099111a9fbaf31e954ca91a18d47272590f60ea1 diff --git a/qtsensors b/qtsensors new file mode 160000 index 00000000..b550c498 --- /dev/null +++ b/qtsensors @@ -0,0 +1 @@ +Subproject commit b550c4980cf874ce84419a86c933c32504b9b19d diff --git a/qtsystems b/qtsystems new file mode 160000 index 00000000..620592b4 --- /dev/null +++ b/qtsystems @@ -0,0 +1 @@ +Subproject commit 620592b4bc2fb4f92cfbd6f09eeafb31b30cb941 diff --git a/qtwayland b/qtwayland new file mode 160000 index 00000000..7334963a --- /dev/null +++ b/qtwayland @@ -0,0 +1 @@ +Subproject commit 7334963a7911f5e8cfc18d6a21876bb9c16f1ab8