remove duplicated nested condition
Change-Id: I433773dbf21a7a7625d4f763b3cebe75c746aa1f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
40babf8b4a
commit
e8b2ff63ec
@ -963,22 +963,19 @@ foreach my $lib (@modules_to_sync) {
|
|||||||
$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
|
||||||
if($public_header) {
|
|
||||||
my $pri_install_iheader = fixPaths($iheader, $dir);
|
my $pri_install_iheader = fixPaths($iheader, $dir);
|
||||||
foreach my $class (@classes) {
|
foreach my $class (@classes) {
|
||||||
# Strip namespaces:
|
# Strip namespaces:
|
||||||
$class =~ s/^.*:://;
|
$class =~ s/^.*:://;
|
||||||
# if ($class =~ m/::/) {
|
# if ($class =~ m/::/) {
|
||||||
# $class =~ s,::,/,g;
|
# $class =~ s,::,/,g;
|
||||||
# }
|
# }
|
||||||
my $class_header = fixPaths("$out_basedir/include/$lib/$class",
|
my $class_header = fixPaths("$out_basedir/include/$lib/$class", $dir) . " ";
|
||||||
$dir) . " ";
|
|
||||||
$pri_install_classes .= $class_header
|
$pri_install_classes .= $class_header
|
||||||
unless($pri_install_classes =~ $class_header);
|
unless($pri_install_classes =~ $class_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, $dir);
|
my $pri_install_iheader = fixPaths($iheader, $dir);
|
||||||
$pri_install_qpafiles.= "$pri_install_iheader ";;
|
$pri_install_qpafiles.= "$pri_install_iheader ";;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user