lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

init-repository: Fix incorrect use of 'or' operator

Browse Source 
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'

Pick-to: 6.1 6.0 5.15
Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Topi Reinio
2021-02-25 15:07:57 +01:00
parent 0a6511c1e7
commit 8ebf0095c3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init-repository
View File

@@ -646,7 +646,7 @@ sub run
die("Have no origin remote.\n") if (!$url); die("Have no origin remote.\n") if (!$url);
$url =~ s,\.git$,,; $url =~ s,\.git$,,;
$url =~ s/((?:tqtc-)?qt5)$//; $url =~ s/((?:tqtc-)?qt5)$//;
my $qtrepo = $1 or 'qt5'; my $qtrepo = $1 || 'qt5';
$self->{'base-url'} = $url; $self->{'base-url'} = $url;
$self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});