Fixes: MTextEdit pre-edit text style storing...

RevBy: Pekka Vuorela
Details: ...not to mess with global state (model's cursor).

1 files changed, 4 insertions, 6 deletions

diff --git a/src/corelib/widgets/mtextedit.cpp b/src/corelib/widgets/mtextedit.cpp
index d5351d52..4db8e770 100755
--- a/src/corelib/widgets/mtextedit.cpp
+++ b/src/corelib/widgets/mtextedit.cpp
@@ -1051,12 +1051,12 @@ QEvent::Type MTextEditPrivate::translateGraphicsSceneMouseTypeToQMouse(QEvent::T
  */
 void MTextEditPrivate::storePreeditTextStyling(int start, int end)
 {
-    QTextCursor *textCursor = cursor();
-    int cursorPosition = textCursor->position();
+    Q_Q(MTextEdit);
+    QTextCursor textCursor(q->document());
 
     for (int i = start + 1; i <= end; ++i) {
-        textCursor->setPosition(i, QTextCursor::KeepAnchor);
-        QTextCharFormat charFormat = textCursor->charFormat();
+        textCursor.setPosition(i, QTextCursor::KeepAnchor);
+        const QTextCharFormat charFormat = textCursor.charFormat();
 
         if (preeditStyling.isEmpty() == false) {
             styleData &currentStyle = preeditStyling.last();
@@ -1078,8 +1078,6 @@ void MTextEditPrivate::storePreeditTextStyling(int start, int end)
             preeditStyling.push_back(newStyle);
         }
     }
-
-    textCursor->setPosition(cursorPosition, QTextCursor::KeepAnchor);
 }