summaryrefslogtreecommitdiffstats
path: root/init-repository
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-12-09 11:59:06 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-19 06:10:27 +0100
commitd64f6a9061b1af00f252270064ca6ce3cee51f00 (patch)
tree88f3f3681d778dc9acb8ce1c61ba88d0c4c21a18 /init-repository
parentd141befd6a39e4f31639342e45da157f9f7b7f78 (diff)
Added new gitmodule `qt3d'
To replace qtquick3d. This commit introduces qt3d, a follow-up commit will remove qtquick3d. Change-Id: I3d1b46e7e1e32960351f02ec22a6e555203f988a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'init-repository')
-rwxr-xr-xinit-repository6
1 files changed, 5 insertions, 1 deletions
diff --git a/init-repository b/init-repository
index 22feedc5..259f6815 100755
--- a/init-repository
+++ b/init-repository
@@ -220,6 +220,7 @@ my %PROTOCOLS = (
);
my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
+ qt3d
qt5
qlalr
qtactiveqt
@@ -467,7 +468,7 @@ sub git_set_submodule_config
if ($protocol) {
# WebKit is special, and has only external link.
- if ($key ne 'qtwebkit') {
+ if ($key ne 'qtwebkit' and $key ne 'qt3d') {
# qt-labs projects are still hosted under qt internally.
if ($protocol ne 'http') {
$value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
@@ -573,6 +574,9 @@ sub git_clone_one_submodule
elsif ($mirror_webkit_url && ($submodule eq 'qtwebkit')) {
$mirror = $mirror_webkit_url;
}
+ if ($mirror && ($submodule eq 'qt3d')) {
+ $mirror =~ s/qtsoftware/gitorious/ ;
+ }
my $do_clone = (! -d "$submodule/.git");
if ($do_clone) {