diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qtextengine.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 41bc249a55..20f85d02aa 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1399,12 +1399,14 @@ void QTextEngine::itemize() const s = 0; } Q_ASSERT(position <= length); - itemizer.generate(prevPosition, position - prevPosition, - formats()->charFormat(format).fontCapitalization()); + QFont::Capitalization capitalization = + formats()->charFormat(format).hasProperty(QTextFormat::FontCapitalization) + ? formats()->charFormat(format).fontCapitalization() + : formats()->defaultFont().capitalization(); + itemizer.generate(prevPosition, position - prevPosition, capitalization); if (it == end) { if (position < length) - itemizer.generate(position, length - position, - formats()->charFormat(format).fontCapitalization()); + itemizer.generate(position, length - position, capitalization); break; } format = frag->format; |