summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-30 21:01:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-28 03:17:11 +0100
commit46feffea1b08767ab8753843beb2d0f93e4a637f (patch)
tree84193d44dae5c89b813d3480b8e08205820099f4 /bin
parente8b2ff63ec47b2f212bb0a92d59a0b5f9e8fb168 (diff)
de-duplicate header install source calculation
Change-Id: I7c26d70fdfceac6d3c562e704cc725fad80c4f59 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt.pl4
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index a2f1b02fcc..bbd514e58b 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -958,12 +958,12 @@ foreach my $lib (@modules_to_sync) {
}
$header_copies++ if (syncHeader($lib, $oheader, $iheader, $copy_headers, $ts));
+ my $pri_install_iheader = fixPaths($iheader, $dir);
if($public_header) {
#put it into the master file
$master_contents .= "#include \"$public_header\"\n" if (shouldMasterInclude($iheader));
#deal with the install directives
- my $pri_install_iheader = fixPaths($iheader, $dir);
foreach my $class (@classes) {
# Strip namespaces:
$class =~ s/^.*:://;
@@ -977,11 +977,9 @@ foreach my $lib (@modules_to_sync) {
$pri_install_files.= "$pri_install_iheader ";;
}
elsif ($qpa_header) {
- my $pri_install_iheader = fixPaths($iheader, $dir);
$pri_install_qpafiles.= "$pri_install_iheader ";;
}
else {
- my $pri_install_iheader = fixPaths($iheader, $dir);
$pri_install_pfiles.= "$pri_install_iheader ";;
}
}