summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAaron McCarthy <mccarthy.aaron@gmail.com>2012-11-04 21:51:07 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-11 10:58:25 +0100
commit0114a99bad161fb0e8de5a384e7e13c9a79f8c98 (patch)
tree8ef3a32d747a427e43c6bec8499136e2eb185df9 /bin
parentb61cff8d6efe0e7669218da2b941705af86ddb1c (diff)
Fix missing namespace macro warnings when building Qt Addon modules.
Addon modules may not be in the standard Qt namespace and therefore do not use the QT_{BEGIN,END}_NAMESPACE macros. Instead module specific QT_{BEGIN,END}_NAMESPACE_FOO macros are used. Extend the syncqt test to allow for this and ensure that the QT_END_NAMESPACE suffix matches the QT_BEGIN_NAMESPACE suffix. Change-Id: I33110c01118b0fb4376307db7447f747fc38bb29 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 88f7135775..33dec2d943 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1172,6 +1172,7 @@ if($check_includes) {
if(open(F, "<$iheader")) {
my $qt_begin_namespace_found = 0;
my $qt_end_namespace_found = 0;
+ my $qt_namespace_suffix = "";
my $line;
my $stop_processing = 0;
while($line = <F>) {
@@ -1196,9 +1197,10 @@ if($check_includes) {
}
}
}
- } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) {
+ } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE(_[A-Z_]+)?\s*$/) {
+ $qt_namespace_suffix = $1 // "";
$qt_begin_namespace_found = 1;
- } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {
+ } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE$qt_namespace_suffix\s*$/) {
$qt_end_namespace_found = 1;
}
}
@@ -1209,7 +1211,7 @@ if($check_includes) {
}
if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) {
- print "$lib: WARNING: $iheader has QT_BEGIN_NAMESPACE but no QT_END_NAMESPACE\n";
+ print "$lib: WARNING: $iheader has QT_BEGIN_NAMESPACE$qt_namespace_suffix but no QT_END_NAMESPACE$qt_namespace_suffix\n";
}
}