Remove QtQuick3D repository references from Qt5.

Qt3D had temporarily resided in the Qt5 repository under qtquick3d.
There is now a qt3d submodule which is compiling and testing correctly.
Qt5 had previously removed support for building the qtquick3d submodule
by default. This commit is the final step in cleaning up the previous
version.

Task-number: QTBUG-22098

Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>

1 files changed, 3 insertions, 22 deletions

diff --git a/init-repository b/init-repository
index acf4bbae..27e15add 100755
--- a/init-repository
+++ b/init-repository
@@ -246,16 +246,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwebkit-examples-and-demos
     qtxmlpatterns
 );
-$GERRIT_REPOS{qtquick3d} = "qt/quick3d";
-
-# Protocol-specific repo overrides, if they differ from the values set in the git submodule config
-# (e.g. because public vs private names differ for whatever reason)
-my %PROTOCOL_REPOS = (
-    qtquick3d   =>  {
-        internal    =>  "qt/quick3d",   # instead of qt-quick3d/qt-quick3d on gitorious
-        ssh         =>  "qt/quick3d",
-    },
-);
 
 my $GERRIT_SSH_BASE
     = 'ssh://@USER@codereview.qt-project.org@PORT@/';
@@ -467,17 +457,8 @@ sub git_set_submodule_config
                     $value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
                 }
 
-                if ($PROTOCOL_REPOS{$key}->{$protocol}) {
-                    # If this repo has an explicitly set basename for this protocol, use it...
-                    # e.g.   'git@example.com:'     . 'qt/quick3d'
-                    $value = $url_base_for_protocol . $PROTOCOL_REPOS{$key}->{$protocol};
-                }
-                else {
-                    # ...otherwise, assume the selected protocol uses same naming structure
-                    # as gitorious.org
-                    # e.g. git://gitorious.org/qt/qt5 => git@example.com:qt/qt5
-                    $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
-                }
+                # assume all other projects hosted under gitorious publicly.
+                $value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
             }
         }
 
@@ -562,7 +543,7 @@ sub git_clone_one_submodule
 
     my $mirror;
     if ($mirror_url && ($submodule ne 'qtwebkit')) {
-        $mirror = $mirror_url.( $PROTOCOL_REPOS{$submodule}->{internal} // "qt/$submodule" );
+        $mirror = $mirror_url."qt/$submodule";
         $mirror .= ".git" unless (-d $mirror); # Support local disk mirror
     }
     elsif ($mirror_webkit_url && ($submodule eq 'qtwebkit')) {