diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-11-15 18:17:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-24 13:50:37 +0100 |
| commit | 38276a3d5348423a222c0fc794a28ab361d97e78 (patch) | |
| tree | 30b5d3898ef2f2d052e6f65a10235a6cea756bb4 /src | |
| parent | b7be92e8ad22481c79f87e3741f85609c2612be7 (diff) | |
TextInput elements not to have tentative commit in inputMethodQuery
Tentative commit should not be part of surrounding text, it's already
a property of the input method.
Change-Id: I64aec9763fb20770b6729f7f59dcbe23cf5a6718
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/items/qquicktextinput.cpp | 2 | ||||
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativetextinput.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/items/qquicktextinput.cpp b/src/declarative/items/qquicktextinput.cpp index 218a313a17..c9469babdb 100644 --- a/src/declarative/items/qquicktextinput.cpp +++ b/src/declarative/items/qquicktextinput.cpp @@ -1355,7 +1355,7 @@ QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property) const && !d->control->passwordEchoEditing()) { return QVariant(displayText()); } else { - return QVariant(text()); + return QVariant(d->control->realText()); } case Qt::ImCurrentSelection: return QVariant(selectedText()); diff --git a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp index 009c72a4cd..04aa06d7c8 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextinput.cpp @@ -1396,7 +1396,7 @@ QVariant QDeclarative1TextInput::inputMethodQuery(Qt::InputMethodQuery property) && !d->control->passwordEchoEditing()) return QVariant(displayText()); else - return QVariant(text()); + return QVariant(d->control->realText()); case Qt::ImCurrentSelection: return QVariant(selectedText()); case Qt::ImMaximumTextLength: |