From 602203cf062a0305f0d6333f0d05a87f8a093f07 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 9 May 2012 15:06:25 +0200 Subject: [PATCH] Don't ignore default font's font capitalization in QTextDocument The consequence of this was e.g. that it would be impossible to set the capitalization of TextEdit elements (or Text elements with RichText format) in QML. Change-Id: Ie219fac7e4305efc59a4ac9da5b06c25ff3ac9ac Reviewed-by: Jiang Jiang --- src/gui/text/qtextengine.cpp | 10 ++++++---- 1 file 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;