diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-30 21:00:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 03:17:11 +0100 |
commit | e8b2ff63ec47b2f212bb0a92d59a0b5f9e8fb168 (patch) | |
tree | bbe380ebb7a74d7970adf7a92f6efd5c5143e0a0 /bin | |
parent | 40babf8b4a039bc8671696c74d8e22c719c30021 (diff) |
remove duplicated nested condition
Change-Id: I433773dbf21a7a7625d4f763b3cebe75c746aa1f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt.pl | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 6ae4128b81..a2f1b02fcc 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -963,21 +963,18 @@ foreach my $lib (@modules_to_sync) { $master_contents .= "#include \"$public_header\"\n" if (shouldMasterInclude($iheader)); #deal with the install directives - if($public_header) { - my $pri_install_iheader = fixPaths($iheader, $dir); - foreach my $class (@classes) { - # Strip namespaces: - $class =~ s/^.*:://; - # if ($class =~ m/::/) { - # $class =~ s,::,/,g; - # } - my $class_header = fixPaths("$out_basedir/include/$lib/$class", - $dir) . " "; - $pri_install_classes .= $class_header - unless($pri_install_classes =~ $class_header); - } - $pri_install_files.= "$pri_install_iheader ";; + my $pri_install_iheader = fixPaths($iheader, $dir); + foreach my $class (@classes) { + # Strip namespaces: + $class =~ s/^.*:://; +# if ($class =~ m/::/) { +# $class =~ s,::,/,g; +# } + my $class_header = fixPaths("$out_basedir/include/$lib/$class", $dir) . " "; + $pri_install_classes .= $class_header + unless($pri_install_classes =~ $class_header); } + $pri_install_files.= "$pri_install_iheader ";; } elsif ($qpa_header) { my $pri_install_iheader = fixPaths($iheader, $dir); |