diff options
| author | Simo Fält <simo.falt@digia.com> | 2014-11-19 13:29:54 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@digia.com> | 2014-11-19 14:15:54 +0100 |
| commit | 0ef652949e5da7b2de813fe68deb862ce491f830 (patch) | |
| tree | 1e362c0ba6ad0c52e645c6266820fe5e8bf058f5 /scripts/qt | |
| parent | 3d94ab6864310d3d8889cab8e0935c10dd15adca (diff) | |
Submodule update bot: Set correct branch for Qt3D
Change-Id: Iff5a801a16811366dd5da6f0b31b272a95cb7da8
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qt_update_submodules.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl index 4b756d1d..770108a9 100755 --- a/scripts/qt/qt_update_submodules.pl +++ b/scripts/qt/qt_update_submodules.pl @@ -80,8 +80,8 @@ sub get_submodule_ref { my ($submodule, $qt_branch) = @_; - my @submodules_based_only_on_master_branch = ('qt3d', 'qtdocgallery', 'qtfeedback', 'qtjsondb', 'qtqa', 'qtrepotools'); - my @submodules_based_only_on_dev_branch = ('qtpim'); + my @submodules_based_only_on_master_branch = ('qtdocgallery', 'qtfeedback', 'qtjsondb', 'qtqa', 'qtrepotools'); + my @submodules_based_only_on_dev_branch = ('qt3d','qtpim'); my %submodules_based_on_custom_branch = ( 'qtenginio' => { |