diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-07 17:18:50 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 09:00:23 +0000 |
commit | 9a1163c7aef3aec360d7a3bf95861ee61f5888f2 (patch) | |
tree | b01c20621cfa130879ad922698d0b7a5b2683632 | |
parent | aec9cebf8c1ef4b9d497f76337d7af0b8b5f8d46 (diff) | |
download | qtbase-9a1163c7aef3aec360d7a3bf95861ee61f5888f2.tar.gz |
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 <lars.knoll@qt.io>
-rwxr-xr-x | bin/syncqt.pl | 8 |
1 files 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) { |