AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

de-duplicate header install source calculation

Browse Source 
Change-Id: I7c26d70fdfceac6d3c562e704cc725fad80c4f59
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-01-30 21:01:23 +01:00 committed by The Qt Project
parent e8b2ff63ec
commit 46feffea1b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/syncqt.pl
View File

@ -958,12 +958,12 @@ foreach my $lib (@modules_to_sync) {
} }
$header_copies++ if (syncHeader($lib, $oheader, $iheader, $copy_headers, $ts)); $header_copies++ if (syncHeader($lib, $oheader, $iheader, $copy_headers, $ts));
my $pri_install_iheader = fixPaths($iheader, $dir);
if($public_header) { if($public_header) {
#put it into the master file #put it into the master file
$master_contents .= "#include \"$public_header\"\n" if (shouldMasterInclude($iheader)); $master_contents .= "#include \"$public_header\"\n" if (shouldMasterInclude($iheader));
#deal with the install directives #deal with the install directives
my $pri_install_iheader = fixPaths($iheader, $dir);
foreach my $class (@classes) { foreach my $class (@classes) {
# Strip namespaces: # Strip namespaces:
$class =~ s/^.*:://; $class =~ s/^.*:://;
@ -977,11 +977,9 @@ foreach my $lib (@modules_to_sync) {
$pri_install_files.= "$pri_install_iheader ";; $pri_install_files.= "$pri_install_iheader ";;
} }
elsif ($qpa_header) { elsif ($qpa_header) {
my $pri_install_iheader = fixPaths($iheader, $dir);
$pri_install_qpafiles.= "$pri_install_iheader ";; $pri_install_qpafiles.= "$pri_install_iheader ";;
} }
else { else {
my $pri_install_iheader = fixPaths($iheader, $dir);
$pri_install_pfiles.= "$pri_install_iheader ";; $pri_install_pfiles.= "$pri_install_iheader ";;
} }
} }