AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syncqt.pl: fix a few misguided regexes to match .h file names

Browse Source 
To match correctly (only) .h files, a regex needs to end in \.h$
Some of them missed the \, one missed the $.
(The last also had a legitimate .* before its misunescaped .)
One pair matched _p.h and _pch.h, which could be combined.

Change-Id: I7539a28eb7017cd0f1b36c72e05108e03a68a952
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2016-09-14 16:48:10 +02:00 committed by Marc Mutz
parent da2c73ad2b
commit cf0119bb69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/syncqt.pl
View File

@ -355,7 +355,7 @@ sub check_header {
$include = 0; $include = 0;
} }
if ($include && $public_header) { if ($include && $public_header) {
print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p.h$/); print STDERR "$lib: ERROR: $iheader includes private header $include\n" if ($include =~ /_p\.h$/);
for my $trylib (keys(%modules)) { for my $trylib (keys(%modules)) {
if (-e "$out_basedir/include/$trylib/$include") { if (-e "$out_basedir/include/$trylib/$include") {
print STDERR "$lib: WARNING: $iheader includes $include when it should include $trylib/$include\n"; print STDERR "$lib: WARNING: $iheader includes $include when it should include $trylib/$include\n";
@ -982,7 +982,7 @@ foreach my $lib (@modules_to_sync) {
my $header_dirname = ""; my $header_dirname = "";
foreach my $header (@headers) { foreach my $header (@headers) {
my $shadow = ($header =~ s/^\*//); my $shadow = ($header =~ s/^\*//);
$header = 0 if($header =~ /^ui_.*.h/); $header = 0 if ($header =~ /^ui_.*\.h$/);
foreach (@ignore_headers) { foreach (@ignore_headers) {
$header = 0 if($header eq $_); $header = 0 if($header eq $_);
} }
@ -994,7 +994,7 @@ foreach my $lib (@modules_to_sync) {
if(isQpaHeader($public_header)) { if(isQpaHeader($public_header)) {
$public_header = 0; $public_header = 0;
$qpa_header = 1; $qpa_header = 1;
} elsif($allheadersprivate || $thisprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { } elsif ($allheadersprivate || $thisprivate || $public_header =~ /_p(ch)?\.h$/) {
$public_header = 0; $public_header = 0;
} else { } else {
foreach (@ignore_for_master_contents) { foreach (@ignore_for_master_contents) {