diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-01 04:33:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-01 04:33:35 (GMT) |
| commit | 20def6f5fe3e02bda1c5f5873ed1923d36511312 (patch) | |
| tree | fa54b317476e2cae5d9bc019c7d98e1c85556dd6 /src | |
| parent | 5aa4dd9f3fdc11d00b0b92a4dd5ec66cc4d1f24e (diff) | |
| parent | fdca50a7c6833b4d2d47d645a0186112a0cc5462 (diff) | |
| download | Qt-20def6f5fe3e02bda1c5f5873ed1923d36511312.zip Qt-20def6f5fe3e02bda1c5f5873ed1923d36511312.tar.gz Qt-20def6f5fe3e02bda1c5f5873ed1923d36511312.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 9919904..3382628 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -704,6 +704,8 @@ bool QDeclarativeTextInput::event(QEvent* ev) break; default: handled = d->control->processEvent(ev); + if (ev->type() == QEvent::InputMethod) + updateSize(); } if(!handled) return QDeclarativePaintedItem::event(ev); |