summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-04-04 07:37:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-04 17:25:51 +0200
commit80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 (patch)
treee5ad1a2c174b6e64c82c0ef5f89296c8d2811d60
parent66ed87fc6792a285430e88d8a9de496a532df8d8 (diff)
Add new modules (qtquickcontrols, qtserialport and qtx11extras)v5.1.0-alpha1
Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
-rw-r--r--.gitmodules9
-rwxr-xr-xinit-repository7
-rw-r--r--qt.pro3
m---------qtquickcontrols0
m---------qtsensors0
m---------qtserialport0
m---------qtx11extras0
7 files changed, 19 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 7d1c81e0..584c4cec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,12 @@
[submodule "qtgraphicaleffects"]
path = qtgraphicaleffects
url = git://gitorious.org/qt/qtgraphicaleffects.git
+[submodule "qtquickcontrols"]
+ path = qtquickcontrols
+ url = git://gitorious.org/qt/qtquickcontrols.git
+[submodule "qtserialport"]
+ path = qtserialport
+ url = git://gitorious.org/qt/qtserialport.git
+[submodule "qtx11extras"]
+ path = qtx11extras
+ url = git://gitorious.org/qt/qtx11extras.git
diff --git a/init-repository b/init-repository
index a89abbff..5a2bd2ce 100755
--- a/init-repository
+++ b/init-repository
@@ -230,9 +230,11 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtpim
qtqa
qtquick1
+ qtquickcontrols
qtrepotools
qtscript
qtsensors
+ qtserialport
qtsvg
qtsystems
qttools
@@ -240,6 +242,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtwayland
qtwebkit
qtwebkit-examples-and-demos
+ qtx11extras
qtxmlpatterns
);
@@ -254,13 +257,17 @@ my @DEFAULT_REPOS = qw(
qtmultimedia
qtqa
qtquick1
+ qtquickcontrols
qtrepotools
qtscript
+ qtsensors
+ qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples-and-demos
+ qtx11extras
qtxmlpatterns
);
diff --git a/qt.pro b/qt.pro
index 7d1a78b8..3baaf6a5 100644
--- a/qt.pro
+++ b/qt.pro
@@ -50,11 +50,13 @@ defineTest(addModule) {
# it may not build.
addModule(qtbase)
+addModule(qtx11extras, qtbase)
addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtjsbackend, qtbase)
addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
+addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtdeclarative)
addModule(qtactiveqt, qtbase)
addModule(qt3d, qtdeclarative)
@@ -74,6 +76,7 @@ addModule(qtscript, qtbase)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
addModule(qtdocgallery, qtdeclarative, qtjsondb)
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
+addModule(qtserialport, qtbase)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)
diff --git a/qtquickcontrols b/qtquickcontrols
new file mode 160000
+Subproject 73b217015c274e20225f3cd0f7bbb7225b3f201
diff --git a/qtsensors b/qtsensors
-Subproject b550c4980cf874ce84419a86c933c32504b9b19
+Subproject 6a4f3ba1b15a1e2e3c6bf3b4e085db0a47f0b48
diff --git a/qtserialport b/qtserialport
new file mode 160000
+Subproject 104780b1c8ddbd8bc7da3ad905a7a2df192f46a
diff --git a/qtx11extras b/qtx11extras
new file mode 160000
+Subproject 0ce7f8ac3dc09ae90ba8dd7d6627a0ad7a86904