diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-03-14 18:18:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-14 19:49:38 +0100 |
| commit | ee328adb2eb4d6e7baeda39db13f693628eaa0cf (patch) | |
| tree | 19e23f9fbd62b86a37a9918406357816a0b04fc8 | |
| parent | 8977d2fbb4f8e64ed2aa4e7470ca1d3f7f387f7f (diff) | |
QTextEngine capitalization doesn't work with QRawFont
The capitalization settings is attempted read via specialData->addFormats,
but the QTextCharFormat there is reset when added, and should instead be
accessed through specialData->addFormatIndices.
Change-Id: I190c419f07c3f7e803ca1d44059e8f538216b9ab
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index a0deeddb33..f1a0804e68 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1435,9 +1435,10 @@ void QTextEngine::itemize() const int lastIndex = 0; for (int i = 0; i < specialData->addFormats.size(); ++i) { const QTextLayout::FormatRange &range = specialData->addFormats.at(i); - if (range.format.fontCapitalization()) { + QTextCharFormat format = formats()->charFormat(specialData->addFormatIndices.at(i)); + if (format.fontCapitalization()) { itemizer.generate(lastIndex, range.start - lastIndex, QFont::MixedCase); - itemizer.generate(range.start, range.length, range.format.fontCapitalization()); + itemizer.generate(range.start, range.length, format.fontCapitalization()); lastIndex = range.start + range.length; } } |