diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:32:03 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:32:03 (GMT) |
| commit | 274619e086e6e9ebba6c383ffb837dc140c840e7 (patch) | |
| tree | b156bcf32c56a5e22a5c29d2af19bc37c5a8f797 /src/gui/inputmethod | |
| parent | 9f51c31a0f492c20e6d882b2ae1e036b29c2755c (diff) | |
| parent | b7c57a2e26a325a1876bd7c68d9f187da084d569 (diff) | |
| download | Qt-274619e086e6e9ebba6c383ffb837dc140c840e7.zip Qt-274619e086e6e9ebba6c383ffb837dc140c840e7.tar.gz Qt-274619e086e6e9ebba6c383ffb837dc140c840e7.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/inputmethod')
| -rw-r--r-- | src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 75ce9e0..56338b2 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -475,8 +475,8 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget) windowToMove->setUpdatesEnabled(false); if (!alwaysResize) { - if (gv->scene()) { - if (gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) { + if (gv->scene() && S60->partial_keyboardAutoTranslation) { + if (gv->scene()->focusItem()) { // Check if the widget contains cursorPositionChanged signal and disconnect from it. QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged())); int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1)); |