summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-12 16:32:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-13 05:51:19 +0200
commit69d1a4edb9fa5dfd85a5187ad1be0dc6504903e2 (patch)
tree34c91d36f5ab1936691d0cda27e214a6bdfa9a64 /bin
parent76874dea4449029856a7a1f639b995a9e35c6166 (diff)
syncqt: Fix warnings about missing QT_BEGIN_HEADER/NAMESPACE.
Do not print warnings when stop-processing pragma was encountered. Change-Id: I0dd3b317b3a685afe613527988eb137325037e16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 4d3ae59bdd..bbbbe33d50 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1206,10 +1206,12 @@ if($check_includes) {
my $qt_begin_namespace_found = 0;
my $qt_end_namespace_found = 0;
my $line;
+ my $stop_processing = 0;
while($line = <F>) {
chomp $line;
my $output_line = 1;
if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {
+ $stop_processing = 1;
last;
} elsif($line =~ /^ *\# *include/) {
my $include = $line;
@@ -1237,7 +1239,7 @@ if($check_includes) {
$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) {
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) {
print "$lib: WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";
}