diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 01:01:24 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 01:01:24 +0200 |
commit | d2db94cc54aa1fde0b33d4cdfa864e8ff2c9e0f4 (patch) | |
tree | 18dd95d233855d6d12830bedab1fe0e7878b2ca9 /src/corelib | |
parent | d795272af5434bdcc794e80e077323a0d1140ab2 (diff) | |
parent | bc1f7c7cce30dc158b4a89f65acf7288f10447dd (diff) |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: I10ca9b20c26838800c654103951367a36af3ee30
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 // |