diff options
author | Maks Naumov <maksqwe1@ukr.net> | 2015-01-19 18:18:30 +0200 |
---|---|---|
committer | Maks Naumov <maksqwe1@ukr.net> | 2015-01-23 14:02:17 +0100 |
commit | 83097588797c5d0d549d70621b6f5158dfd3fac7 (patch) | |
tree | f51069dba7d68fb7bdfd988e3dc5ebf2bc3eb5c6 /src/gui | |
parent | ff59d73ac6e964212b5e3ff16a30e88e828f01b2 (diff) |
QTextCharFormat: fix word spacing setup
Properly check QFont::WordSpacingResolved when use setFont()
with QTextCharFormat::FontPropertiesSpecifiedOnly
Change-Id: I72f1641ef7587cbaf8fcf5fef2f3c44393b0ebfc
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qtextformat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index fa294e44fd..0bffbcc802 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -1942,7 +1942,7 @@ void QTextCharFormat::setFont(const QFont &font, FontPropertiesInheritanceBehavi setFontFixedPitch(font.fixedPitch()); if (mask & QFont::CapitalizationResolved) setFontCapitalization(font.capitalization()); - if (mask & QFont::LetterSpacingResolved) + if (mask & QFont::WordSpacingResolved) setFontWordSpacing(font.wordSpacing()); if (mask & QFont::LetterSpacingResolved) { setFontLetterSpacingType(font.letterSpacingType()); |