From 80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Apr 2013 07:37:42 +0200 Subject: Add new modules (qtquickcontrols, qtserialport and qtx11extras) Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) --- .gitmodules | 9 +++++++++ init-repository | 7 +++++++ qt.pro | 3 +++ qtquickcontrols | 1 + qtsensors | 2 +- qtserialport | 1 + qtx11extras | 1 + 7 files changed, 23 insertions(+), 1 deletion(-) create mode 160000 qtquickcontrols create mode 160000 qtserialport create mode 160000 qtx11extras 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 index 00000000..73b21701 --- /dev/null +++ b/qtquickcontrols @@ -0,0 +1 @@ +Subproject commit 73b217015c274e20225f3cd0f7bbb7225b3f201f diff --git a/qtsensors b/qtsensors index b550c498..6a4f3ba1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b550c4980cf874ce84419a86c933c32504b9b19d +Subproject commit 6a4f3ba1b15a1e2e3c6bf3b4e085db0a47f0b481 diff --git a/qtserialport b/qtserialport new file mode 160000 index 00000000..104780b1 --- /dev/null +++ b/qtserialport @@ -0,0 +1 @@ +Subproject commit 104780b1c8ddbd8bc7da3ad905a7a2df192f46a9 diff --git a/qtx11extras b/qtx11extras new file mode 160000 index 00000000..0ce7f8ac --- /dev/null +++ b/qtx11extras @@ -0,0 +1 @@ +Subproject commit 0ce7f8ac3dc09ae90ba8dd7d6627a0ad7a869040 -- cgit v1.2.3