diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-04-06 14:50:38 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-04-14 10:14:37 +0000 |
| commit | 504b37e39955f223ccd80188bd1badbd197286e1 (patch) | |
| tree | 69cb2e84fa6eecab19ff565f3735ac207aece828 /bin | |
| parent | 10c1625cd8c32faf6a1d42c2106b3b3966175c96 (diff) | |
syncqt: Ignore deprecation macros when resolving class names
Otherwise we will fail to resolve the symbol and will not create
a forwarding header for the class.
Change-Id: I34922d8458bdb994a194108183ac9b9d14530c5e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 72996a526e..7ede34cf1d 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -231,7 +231,6 @@ sub classNames { $line .= ";" if($line =~ m/^Q_[A-Z_0-9]*\(.*\)[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE(_[A-Z]+)*[\r\n]*$/); #qt macro - $line .= ";" if($line =~ m/^QT_DEPRECATED_X\(.*\)[\r\n]*$/); #qt macro $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro $line .= ";" if($line =~ m/^QT_WARNING_(PUSH|POP|DISABLE_\w+\(.*\))[\r\n]*$/); # qt macros $$requires = $1 if ($line =~ m/^QT_REQUIRE_CONFIG\((.*)\);[\r\n]*$/); @@ -298,6 +297,7 @@ sub classNames { if($definition) { $definition =~ s=[\n\r]==g; + $definition =~ s/QT_DEPRECATED_X\s*\(\s*".*?"\s*\)//g; my @symbols; my $post_kw = qr/Q_DECL_FINAL|final|sealed/; # add here macros and keywords that go after the class-name of a class definition if($definition =~ m/^ *typedef *.*\(\*([^\)]*)\)\(.*\);$/) { |