Fix unaligned specialData formats

Handle the case were a format was applied that does not align with
the fragments.

Pick-to: 6.2 6.1 5.15
Change-Id: I27593a50c587a5ec0290ff9d0a7a9767a3981cac
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index bada332316..74967aeac9 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2011,10 +2011,15 @@ void QTextEngine::itemize() const
                         : formatCollection()->defaultFont().capitalization();
                 if (s) {
                     for (const auto &range : qAsConst(s->formats)) {
-                        if (range.start >= prevPosition && range.start < position && range.format.hasProperty(QTextFormat::FontCapitalization)) {
-                            itemizer.generate(prevPosition, range.start - prevPosition, capitalization);
-                            itemizer.generate(range.start, range.length, range.format.fontCapitalization());
-                            prevPosition = range.start + range.length;
+                        if (range.start + range.length <= prevPosition || range.start >= position)
+                            continue;
+                        if (range.format.hasProperty(QTextFormat::FontCapitalization)) {
+                            if (range.start > prevPosition)
+                                itemizer.generate(prevPosition, range.start - prevPosition, capitalization);
+                            int newStart = std::max(prevPosition, range.start);
+                            int newEnd = std::min(position, range.start + range.length);
+                            itemizer.generate(newStart, newEnd - newStart, range.format.fontCapitalization());
+                            prevPosition = newEnd;
                         }
                     }
                 }