diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-30 20:27:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 03:17:11 +0100 |
| commit | 40babf8b4a039bc8671696c74d8e22c719c30021 (patch) | |
| tree | d49fdfab25dc0587a0dac3851752728b6542f978 /bin | |
| parent | 6571aaf1c45885407038e03b0e9ed5952a06baeb (diff) | |
un-pluralize code
since ever we've thrown out the phonon hack, each header is synced to
only one location (CamelCase headers notwithstanding).
Change-Id: Idfef33db9410908aefe309bc7a3edeae5fc5a671
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 2a1523bbbd..6ae4128b81 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -937,9 +937,9 @@ foreach my $lib (@modules_to_sync) { } else { my $ts = (stat($iheader))[9]; #find out all the places it goes.. - my @headers; + my $oheader; if ($public_header) { - @headers = ( "$out_basedir/include/$lib/$header" ); + $oheader = "$out_basedir/include/$lib/$header"; foreach my $full_class (@classes) { my $header_base = basename($header); # Strip namespaces: @@ -952,14 +952,11 @@ foreach my $lib (@modules_to_sync) { $header_copies++ if (syncHeader($lib, "$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0, $ts)); } } elsif ($create_private_headers && !$qpa_header) { - @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" ); + $oheader = "$out_basedir/include/$lib/$module_version/$lib/private/$header"; } elsif ($create_private_headers) { - @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" ); - } - - foreach(@headers) { #sync them - $header_copies++ if (syncHeader($lib, $_, $iheader, $copy_headers, $ts)); + $oheader = "$out_basedir/include/$lib/$module_version/$lib/qpa/$header"; } + $header_copies++ if (syncHeader($lib, $oheader, $iheader, $copy_headers, $ts)); if($public_header) { #put it into the master file |