From 4ab22fd809a43a57bf401e68282b697d5e5fd008 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Thu, 2 Feb 2012 14:58:49 +0200 Subject: 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 --- src/quick/items/qquickitem.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/quick/items/qquickitem.cpp') 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); } -- cgit v1.2.3