diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 16:04:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 16:04:06 (GMT) |
| commit | af0749b1bf75f30eb956697fbe96bd75b80af031 (patch) | |
| tree | b431e9dce6fa2cfe45d67abdb8fb9967beb6fd0f | |
| parent | 1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1 (diff) | |
| parent | 18e60ed7e49c08ac216d7ee17a18f5af17333115 (diff) | |
| download | Qt-af0749b1bf75f30eb956697fbe96bd75b80af031.zip Qt-af0749b1bf75f30eb956697fbe96bd75b80af031.tar.gz Qt-af0749b1bf75f30eb956697fbe96bd75b80af031.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
| -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 5ddd53f..7beaa76 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -474,7 +474,7 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget) if (!alwaysResize) { if (gv->scene()) { - if (gv->scene()->focusItem()) { + if (gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) { // 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)); @@ -580,7 +580,7 @@ void QCoeFepInputContext::ensureFocusWidgetVisible(QWidget *widget) if (!moveWithinVisibleArea) { // Check if the widget contains cursorPositionChanged signal and connect to it. QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged())); - if (gv->scene() && gv->scene()->focusItem()) { + if (gv->scene() && gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) { int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1)); if (index != -1) connect(gv->scene()->focusItem()->toGraphicsObject(), SIGNAL(cursorPositionChanged()), this, SLOT(translateInputWidget())); |