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

Fix missing namespace macro warnings when building Qt Addon modules.

Browse Source 
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>
This commit is contained in:
Aaron McCarthy 2012-11-04 21:51:07 +10:00 committed by The Qt Project
parent b61cff8d6e
commit 0114a99bad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/syncqt
View File

@ -1172,6 +1172,7 @@ if($check_includes) {
if(open(F, "<$iheader")) { if(open(F, "<$iheader")) {
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 $qt_namespace_suffix = "";
my $line; my $line;
my $stop_processing = 0; my $stop_processing = 0;
while($line = <F>) { 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; $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; $qt_end_namespace_found = 1;
} }
} }
@ -1209,7 +1211,7 @@ if($check_includes) {
} }
if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) { 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";
} }
} }