1 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 589c0f701f..e14cfe0f82 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -577,6 +577,21 @@ QString QAbstractTextDocumentLayout::anchorAt(const QPointF& pos) const
     if (cursorPos == -1)
         return QString();
 
+    // compensate for preedit in the hit text block
+    QTextBlock block = document()->firstBlock();
+    while (block.isValid()) {
+        QRectF blockBr = blockBoundingRect(block);
+        if (blockBr.contains(pos)) {
+            QTextLayout *layout = block.layout();
+            int relativeCursorPos = cursorPos - block.position();
+            const int preeditLength = layout ? layout->preeditAreaText().length() : 0;
+            if (preeditLength > 0 && relativeCursorPos > layout->preeditAreaPosition())
+                cursorPos -= qMin(cursorPos - layout->preeditAreaPosition(), preeditLength);
+            break;
+        }
+        block = block.next();
+    }
+
     QTextDocumentPrivate *pieceTable = qobject_cast<const QTextDocument *>(parent())->docHandle();
     QTextDocumentPrivate::FragmentIterator it = pieceTable->find(cursorPos);
     QTextCharFormat fmt = pieceTable->formatCollection()->charFormat(it->format);