diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-02 14:58:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 16:31:27 +0100 |
| commit | 4ab22fd809a43a57bf401e68282b697d5e5fd008 (patch) | |
| tree | 030733f3c19f86b9e09adac4dda1d9be5893425f /src/quick/items/qquickitem.cpp | |
| parent | ee9c5f72d3f48e2d2d3829f39d7accc3513110ab (diff) | |
Adapt to QGuiApplication::focusObject() for notifying input method
Emitting focusObjectChanged() signal now instead of explicitly setting
inputItem to QInputPanel. Also adapted from deprecated
QInputPanel::inputItem() to QGuiApplication::focusObject().
Change-Id: I97460625cc8bb2820ec7716a06330aecd1b585ea
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 5151310927..cc1705feca 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3077,8 +3077,7 @@ void QQuickItem::setInputMethodHints(Qt::InputMethodHints hints) if (!d->canvas || d->canvas->activeFocusItem() != this) return; - QInputPanel *p = qApp->inputPanel(); - if (p->inputItem() == this) + if (qApp->focusObject() == this) qApp->inputPanel()->update(Qt::ImHints); } |