1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

un-pluralize code

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2014-01-30 20:27:00 +01:00 committed by The Qt Project
parent 6571aaf1c4
commit 40babf8b4a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/syncqt.pl
View File

@ -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