diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-08 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-08 01:00:51 +0200 |
| commit | 0a775ded35acf7172e3f852d55de7e28a5370653 (patch) | |
| tree | 8de83b9f8adc12899bb2e6bd40590ecd6727d90c /src/quick/items/qquicktextcontrol.cpp | |
| parent | bb882f433b6cf6fca56049df6b654fb6a39a7cab (diff) | |
| parent | 4a4842118d2303a8d851d1d8b85fe182d3fe492a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3eb5d1affe64b6ae709d1154cc37de91db3816b6
Diffstat (limited to 'src/quick/items/qquicktextcontrol.cpp')
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index a7a90c9134..caef24293a 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -1297,6 +1297,7 @@ void QQuickTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) || e->preeditString() != cursor.block().layout()->preeditAreaText() || e->replacementLength() > 0; bool forceSelectionChanged = false; + int oldCursorPos = cursor.position(); cursor.beginEditBlock(); if (isGettingInput) { @@ -1365,6 +1366,8 @@ void QQuickTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) QTextCursorPrivate *cursor_d = QTextCursorPrivate::getPrivate(&cursor); if (cursor_d) cursor_d->setX(); + if (cursor.position() != oldCursorPos) + emit q->cursorPositionChanged(); q->updateCursorRectangle(oldPreeditCursor != preeditCursor || forceSelectionChanged || isGettingInput); selectionChanged(forceSelectionChanged); } |