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 /src/corelib | |
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 'src/corelib')
-rw-r--r-- | src/corelib/text/qstring.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 7b1351666d..5def2c81a1 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -220,7 +220,8 @@ Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE); // Qt 4.x compatibility #if QT_DEPRECATED_SINCE(5, 14) -QT_DEPRECATED_X("Use QLatin1String") typedef QLatin1String QLatin1Literal; +QT_DEPRECATED_X("Use QLatin1String") +typedef QLatin1String QLatin1Literal; #endif // |