1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QDataStream compatibility for QTextFormat::TextUnderlineColor

Browse Source 
The enum value of that property changed. Use the same mapping trick
as with two other properties to ensure backwards compatibility
in QDataStream.

Change-Id: I01b36f9ecbcaf40e7c8523da33ea4c8f12821a63
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Lars Knoll 2020-11-03 09:36:49 +01:00
parent 801e703a79
commit d5e913cc60
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/text/qtextformat.cpp
View File

@ -455,6 +455,12 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QTextFormat &fmt
properties[QTextFormat::OldFontStretch] = it.value();
properties.erase(it);
}
it = properties.find(QTextFormat::TextUnderlineColor);
if (it != properties.end()) {
properties[QTextFormat::OldTextUnderlineColor] = it.value();
properties.erase(it);
}
}
stream << fmt.format_type << properties;
@ -478,6 +484,8 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
key = QTextFormat::FontLetterSpacingType;
else if (key == QTextFormat::OldFontStretch)
key = QTextFormat::FontStretch;
else if (key == QTextFormat::OldTextUnderlineColor)
key = QTextFormat::TextUnderlineColor;
fmt.d->insertProperty(key, it.value());
}

1
src/gui/text/qtextformat.h
View File

@ -222,6 +222,7 @@ public:
// Should not be referenced in user code.
OldFontLetterSpacingType = 0x2033,
OldFontStretch = 0x2034,
OldTextUnderlineColor = 0x2010,
ObjectType = 0x2f00,