diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-12-09 11:59:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-19 06:10:27 +0100 |
| commit | d64f6a9061b1af00f252270064ca6ce3cee51f00 (patch) | |
| tree | 88f3f3681d778dc9acb8ce1c61ba88d0c4c21a18 | |
| parent | d141befd6a39e4f31639342e45da157f9f7b7f78 (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>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 6 | ||||
| -rw-r--r-- | qt.pro | 9 | ||||
| m--------- | qt3d | 0 |
4 files changed, 16 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 94dbc621..7ee5f34a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,3 +76,6 @@ [submodule "qtjsondb"] path = qtjsondb url = git://gitorious.org/qt/qtjsondb.git +[submodule "qt3d"] + path = qt3d + url = git://gitorious.org/qt/qt3d.git 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) { @@ -81,9 +81,15 @@ module_qtfeedback.subdir = $$IN_PWD/qtfeedback module_qtfeedback.target = module-qtfeedback module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative +module_qt3d.subdir = $$IN_PWD/qt3d +module_qt3d.target = module-qt3d +module_qt3d.depends = module_qtbase module_qtdeclarative +# not yet enabled by default (enable it when removing qtquick3d) +module_qt3d.CONFIG = no_default_target no_default_install + module_qtquick3d.subdir = $$IN_PWD/qtquick3d module_qtquick3d.target = module-qtquick3d -module_qtquick3d.depends = module_qtbase module_qtdeclarative +module_qtquick3d.depends = $${module_qt3d.depends} module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery module_qtdocgallery.target = module-qtdocgallery @@ -132,6 +138,7 @@ 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(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity diff --git a/qt3d b/qt3d new file mode 160000 +Subproject 8c1729b2e52717ce7dc4e3435dca7055672513e |