Remove QtQuick3D repository references from Qt5. master_201201251207
authorToby Tomkins <toby.tomkins@nokia.com>
Thu, 19 Jan 2012 07:50:02 +0000 (17:50 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Jan 2012 01:57:49 +0000 (02:57 +0100)
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>
.gitmodules
init-repository
qt.pro
qtquick3d [deleted submodule]

index 90cae42..6e10557 100644 (file)
@@ -58,9 +58,6 @@
 [submodule "qtfeedback"]
        path = qtfeedback
        url = git://gitorious.org/qt/qtfeedback.git
 [submodule "qtfeedback"]
        path = qtfeedback
        url = git://gitorious.org/qt/qtfeedback.git
-[submodule "qtquick3d"]
-       path = qtquick3d
-       url = git://gitorious.org/qt/quick3d.git
 [submodule "qtdocgallery"]
        path = qtdocgallery
        url = git://gitorious.org/qt/qtdocgallery.git
 [submodule "qtdocgallery"]
        path = qtdocgallery
        url = git://gitorious.org/qt/qtdocgallery.git
index acf4bba..27e15ad 100755 (executable)
@@ -246,16 +246,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwebkit-examples-and-demos
     qtxmlpatterns
 );
     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@/';
 
 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/,;
                 }
 
                     $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')) {
 
     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')) {
         $mirror .= ".git" unless (-d $mirror); # Support local disk mirror
     }
     elsif ($mirror_webkit_url && ($submodule eq 'qtwebkit')) {
diff --git a/qt.pro b/qt.pro
index 9a76ecb..86be51a 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -89,12 +89,6 @@ module_qt3d.subdir = $$IN_PWD/qt3d
 module_qt3d.target = module-qt3d
 module_qt3d.depends = module_qtbase module_qtdeclarative
 
 module_qt3d.target = module-qt3d
 module_qt3d.depends = module_qtbase module_qtdeclarative
 
-module_qtquick3d.subdir = $$IN_PWD/qtquick3d
-module_qtquick3d.target = module-qtquick3d
-module_qtquick3d.depends = $${module_qt3d.depends}
-# disabled by default (to be removed in favor of qt3d)
-module_qtquick3d.CONFIG = no_default_target no_default_install
-
 module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
 module_qtdocgallery.target = module-qtdocgallery
 module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
 module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
 module_qtdocgallery.target = module-qtdocgallery
 module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
@@ -139,7 +133,6 @@ exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
 exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
 exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
 exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
 exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
 exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
 exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
-exists(qtquick3d/qtquick3d.pro): SUBDIRS += module_qtquick3d
 exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
 exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
 exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
 exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
 exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
 exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
diff --git a/qtquick3d b/qtquick3d
deleted file mode 160000 (submodule)
index 7bfb0fb..0000000
--- a/qtquick3d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7bfb0fbb4a9c632e71549cad0f10a36b9fb3d8c1