diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2019-08-30 10:18:22 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2019-09-02 11:33:54 +0200 |
commit | 8ce653e048746d65ae46773f555ee8786b10ff68 (patch) | |
tree | 6bd436beee065a1b80aab2d55aa2fe270c23aa3f /bin | |
parent | e45e6efa723297e8aaa1132251ef55b65201d174 (diff) |
Make sure QLatin1Literal fwd header is generated
This broke when QLatin1Literal got deprecated in change 45373c19243aea335897ba0f371a1dd53ae8f079
Both hunks in this patch are needed. The hunk in syncqt.pl removes the
QT_DEPRECATED_X(...) macro if it appears solely on a line in source code,
the second hunk inserts a newline after the QT_DEPRECATED_X(...) macro usage
to trigger that code path in the Perl script.
Before/after comparison of the headers generated in include/QtCore:
```
% diff ~/old.txt ~/new.txt
105a106
> QLatin1Literal
```
Change-Id: I468dd2dd54bf115521ed82c6182236905556f568
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 43ecff53dd..1258994f93 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -228,6 +228,7 @@ 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]*$/); |