diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-17 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-17 23:00:13 (GMT) |
| commit | 67bbb24c56ffcc0571910c9483cba41c7a4d8b4b (patch) | |
| tree | fce136aaa449fe66c4e9965e18a0ef4c2e38781c /src | |
| parent | 3b5354386225974ea6db78c12f32cb81e2d50104 (diff) | |
| parent | f30cf8d452afd8e279384fe6a6a10216c7d52304 (diff) | |
| download | Qt-67bbb24c56ffcc0571910c9483cba41c7a4d8b4b.zip Qt-67bbb24c56ffcc0571910c9483cba41c7a4d8b4b.tar.gz Qt-67bbb24c56ffcc0571910c9483cba41c7a4d8b4b.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -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())); |