diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-11 17:37:31 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-21 19:59:08 +0200 |
| commit | 8b029ef142526722a0931ae02b681ad57d7fd99a (patch) | |
| tree | cacd4bbec29602beb0f2254bbb7a2598e0b7180e /src/gui/text/qtextformat.h | |
| parent | fc172e3093397990da73e80b737c17ba63375f2c (diff) | |
Do not use QTextFormat::FontFamily when building with QT_DISABLE_DEPRECATED_BEFORE >= 0x060000
The QTextFormat::FontFamily enum is deprecated since Qt 6.0, however it
is still used in the code.
To retain backward compatibility with the old data stream formats, we
introduce a new internal QTextFormat::OldFontFamily enum value, which
has exactly the same value as QTextFormat::FontFamily, and use it
instead.
Task-number: QTBUG-104857
Pick-to: 6.4 6.3 6.2
Change-Id: Ibf5258b621c2b0aa507005dfe2c1e80c26ddb0d4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/text/qtextformat.h')
| -rw-r--r-- | src/gui/text/qtextformat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 95bc9da334..02c66279e2 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -179,6 +179,7 @@ public: OldFontLetterSpacingType = 0x2033, OldFontStretch = 0x2034, OldTextUnderlineColor = 0x2010, + OldFontFamily = 0x2000, // same as FontFamily ObjectType = 0x2f00, |