1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syncqt: Fix warnings about missing QT_BEGIN_HEADER/NAMESPACE.

Browse Source 
Do not print warnings when stop-processing pragma was encountered.

Change-Id: I0dd3b317b3a685afe613527988eb137325037e16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Friedemann Kleint 2012-10-12 16:32:54 +02:00 committed by The Qt Project
parent 76874dea44
commit 69d1a4edb9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/syncqt
View File

@ -1206,10 +1206,12 @@ if($check_includes) {
my $qt_begin_namespace_found = 0; my $qt_begin_namespace_found = 0;
my $qt_end_namespace_found = 0; my $qt_end_namespace_found = 0;
my $line; my $line;
my $stop_processing = 0;
while($line = <F>) { while($line = <F>) {
chomp $line; chomp $line;
my $output_line = 1; my $output_line = 1;
if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) { if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {
$stop_processing = 1;
last; last;
} elsif($line =~ /^ *\# *include/) { } elsif($line =~ /^ *\# *include/) {
my $include = $line; my $include = $line;
@ -1237,7 +1239,7 @@ if($check_includes) {
$qt_end_namespace_found = 1; $qt_end_namespace_found = 1;
} }
} }
if ($header_skip_qt_begin_header_test == 0) { if ($header_skip_qt_begin_header_test == 0 and $stop_processing == 0) {
if ($qt_begin_header_found == 0) { if ($qt_begin_header_found == 0) {
print "$lib: WARNING: $iheader does not include QT_BEGIN_HEADER\n"; print "$lib: WARNING: $iheader does not include QT_BEGIN_HEADER\n";
} }
@ -1247,7 +1249,7 @@ if($check_includes) {
} }
} }
if ($header_skip_qt_begin_namespace_test == 0) { if ($header_skip_qt_begin_namespace_test == 0 and $stop_processing == 0) {
if ($qt_begin_namespace_found == 0) { if ($qt_begin_namespace_found == 0) {
print "$lib: WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n"; print "$lib: WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";
} }