diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2012-03-06 20:14:25 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-11 01:42:12 +0200 |
| commit | 8692326629eb736a007a30f9ccb91c72409c9117 (patch) | |
| tree | 50c8274b7eee40d0a62abf96c10b85957130b73f /bin/syncqt | |
| parent | 90520cd834d84f2b091fea94f1d44bc6cb863420 (diff) | |
Fixed syncqt to ignore all lines that define Qt namespace
That includes non-standard macroses for QtAddOns, e.g. for QtJsonDb addon the
macro looks like QT_BEGIN_NAMESPACE_JSONDB - by default syncqt doesn't
recognize the macro and concantenates it with the next line in the header file,
which breaks forward include generation if that next line is the class
definition.
Change-Id: Ia269f8a091113e4951d6a2615ef392b21bd5e3a3
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'bin/syncqt')
| -rwxr-xr-x | bin/syncqt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt index 581233a162..3e77d2001d 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -227,7 +227,7 @@ sub classNames { $line =~ s,//.*$,,; #remove c++ comments $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro - $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE[\r\n]*$/); #qt macro + $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE(_[A-Z]+)*[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro $parsable .= " " . $line; } |