diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-02 20:56:11 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-02 20:56:12 +0200 |
commit | f390e86c057265446f1467b158c1088212dc93b4 (patch) | |
tree | ca73598b798d309a5a82b858d8689889d03ee5bc /src/quick/items/qquicktextcontrol.cpp | |
parent | 99c96eb1042575a7ca5ba534f453c679c6dc9cd8 (diff) | |
parent | aefbf418b6d99f87f7bcc7df1eb530c278a17ab4 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Icf36857844b6643d9fbe3c841b1d9b78943435d4
Diffstat (limited to 'src/quick/items/qquicktextcontrol.cpp')
-rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index caef24293a..ac8093e10b 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -1403,7 +1403,7 @@ QVariant QQuickTextControl::inputMethodQuery(Qt::InputMethodQuery property, QVar case Qt::ImAnchorPosition: return QVariant(d->cursor.anchor() - block.position()); case Qt::ImAbsolutePosition: - return QVariant(d->cursor.anchor()); + return QVariant(d->cursor.position()); case Qt::ImTextAfterCursor: { int maxLength = argument.isValid() ? argument.toInt() : 1024; |