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

fix installation of aux headers

Browse Source 
the source paths need to be made relative to the main source dir

Change-Id: I98d74eca7e54d1179ab602bb87b96b66f3193ce4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-12 12:16:09 +01:00 committed by The Qt Project
parent a8b7553e46
commit cc90d4a563
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/syncqt
View File

@ -964,7 +964,7 @@ foreach my $lib (@modules_to_sync) {
if($public_header) { if($public_header) {
#deal with the install directives #deal with the install directives
if($public_header) { if($public_header) {
my $pri_install_iheader = fixPaths($iheader, $current_dir); my $pri_install_iheader = fixPaths($iheader, $dir);
foreach my $class (@classes) { foreach my $class (@classes) {
# Strip namespaces: # Strip namespaces:
$class =~ s/^.*:://; $class =~ s/^.*:://;
@ -972,23 +972,24 @@ foreach my $lib (@modules_to_sync) {
# $class =~ s,::,/,g; # $class =~ s,::,/,g;
# } # }
my $class_header = fixPaths("$out_basedir/include/$lib/$class", my $class_header = fixPaths("$out_basedir/include/$lib/$class",
$current_dir) . " "; $dir) . " ";
$pri_install_classes .= $class_header $pri_install_classes .= $class_header
unless($pri_install_classes =~ $class_header); unless($pri_install_classes =~ $class_header);
} }
if ($explicitheaders{$lib}{basename($iheader)}) { if ($explicitheaders{$lib}{basename($iheader)}) {
my $compat_header = fixPaths("$out_basedir/include/$lib/$explicitheaders{$lib}{basename($iheader)}", $current_dir) . " "; my $compat_header = fixPaths("$out_basedir/include/$lib/$explicitheaders{$lib}{basename($iheader)}",
$dir) . " ";
$pri_install_files .= $compat_header unless($pri_install_files =~ $compat_header); $pri_install_files .= $compat_header unless($pri_install_files =~ $compat_header);
} }
$pri_install_files.= "$pri_install_iheader ";; $pri_install_files.= "$pri_install_iheader ";;
} }
} }
elsif ($qpa_header) { elsif ($qpa_header) {
my $pri_install_iheader = fixPaths($iheader, $current_dir); 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, $current_dir); my $pri_install_iheader = fixPaths($iheader, $dir);
$pri_install_pfiles.= "$pri_install_iheader ";; $pri_install_pfiles.= "$pri_install_iheader ";;
} }
} }