From 9a1163c7aef3aec360d7a3bf95861ee61f5888f2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 7 Oct 2016 17:18:50 +0200 Subject: exclude injected headers from headersclean check it makes no sense to check them, as they contain only #defines anyway. Change-Id: I8b36139ee19471de0654c5eb3af262d0389a72f7 Reviewed-by: Lars Knoll --- bin/syncqt.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 8a49da3891..9f5553281b 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -217,8 +217,6 @@ sub classNames { $$requires = ""; my $ihdrbase = basename($iheader); - my $classname = $classnames{$ihdrbase}; - push @ret, split(/,/, $classname) if ($classname); my $parsable = ""; if(open(F, "<$iheader")) { @@ -1042,7 +1040,11 @@ foreach my $lib (@modules_to_sync) { && $header =~ /_p\.h$/ && $subdir !~ /3rdparty/; check_header($lib, $header, $iheader, $public_header, $private_header); } - my @classes = $public_header && (!$minimal && $is_qt) ? classNames($iheader, \$clean_header, \$requires) : (); + my @classes = (); + push @classes, classNames($iheader, \$clean_header, \$requires) + if (!$shadow && $public_header && !$minimal && $is_qt); + my $classname = $classnames{$header}; + push @classes, split(/,/, $classname) if ($classname); if($showonly) { print "$header [$lib]\n"; foreach(@classes) { -- cgit v1.2.3