diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2015-03-12 20:03:18 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@texla.cl> | 2015-03-13 11:18:59 +0000 |
| commit | 6cf766415b2714c896379a4c61b8bebe01d651b0 (patch) | |
| tree | d20e7cc4925b949765b9c8e5327cda1e02442a77 /scripts/qt | |
| parent | 28f95fde38e71e79872719822ff9f35e6d9dbc04 (diff) | |
Make submodule update handle qt3d properly
qt3d now also has a 5.5 branch in addition to its dev branch
Change-Id: Ia546b32bab946cafdf2f23c585d72b75022b5e20
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qt_update_submodules.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl index bf5663b9..5effee80 100755 --- a/scripts/qt/qt_update_submodules.pl +++ b/scripts/qt/qt_update_submodules.pl @@ -81,7 +81,7 @@ sub get_submodule_ref my ($submodule, $qt_branch) = @_; my @submodules_based_only_on_master_branch = ('qtdocgallery', 'qtfeedback', 'qtjsondb', 'qtqa', 'qtrepotools'); - my @submodules_based_only_on_dev_branch = ('qt3d','qtpim'); + my @submodules_based_only_on_dev_branch = ('qtpim'); my %submodules_based_on_custom_branch = ( 'qtenginio' => { |