diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-03 10:07:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 09:54:58 +0100 |
| commit | e761f5b906c427433325debb9f08c4f2d0ba902d (patch) | |
| tree | fa8fbc933b6ed9ea2cdbc918d4317c95992c26e7 /src/quick/items/qquickitem.cpp | |
| parent | 9634dc440269fc03f825a6d18b371d8e612ba9ec (diff) | |
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f443b1acd0..67da4c8fc8 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -54,7 +54,7 @@ #include <QtGui/qpen.h> #include <QtGui/qcursor.h> #include <QtGui/qguiapplication.h> -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include <QtCore/qdebug.h> #include <QtCore/qcoreevent.h> #include <QtCore/qnumeric.h> @@ -3128,7 +3128,7 @@ void QQuickItem::setInputMethodHints(Qt::InputMethodHints hints) return; if (qApp->focusObject() == this) - qApp->inputPanel()->update(Qt::ImHints); + qApp->inputMethod()->update(Qt::ImHints); } QVariant QQuickItem::inputMethodQuery(Qt::InputMethodQuery query) const @@ -3671,7 +3671,7 @@ void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value) void QQuickItem::updateInputMethod(Qt::InputMethodQueries queries) { if (hasActiveFocus()) - qApp->inputPanel()->update(queries); + qApp->inputMethod()->update(queries); } /*! \internal */ |