diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-20 17:57:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 13:27:54 +0100 |
| commit | dd565d2d4c7e9b766bc9f575d803ebaad71b33b7 (patch) | |
| tree | b81f8b84e26c8b433759e6f97cdcacd0c5419dd0 /src/gui/kernel/qinputpanel.h | |
| parent | e7d0d54084aa04387ebfb8cee292248df5355021 (diff) | |
QGuiApplication::focusObject() to replace QInputPanel::inputItem()
* Deprecated QInputPanel::inputWindow() which is already
just returning QGuiApplication::activeWindow()
* Deprecated QInputPanel::inputItem() and introduced
QGuiApplication::focusObject(). Input methods can check
input method support by Qt::ImEnabled query.
Change-Id: I70a9c1c3f79aadb75c839d0489a9428f7a221df5
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/gui/kernel/qinputpanel.h')
| -rw-r--r-- | src/gui/kernel/qinputpanel.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h index 5cfe75d030..01dfb20eb8 100644 --- a/src/gui/kernel/qinputpanel.h +++ b/src/gui/kernel/qinputpanel.h @@ -68,11 +68,11 @@ class Q_GUI_EXPORT QInputPanel : public QObject Q_ENUMS(Action) public: - QObject *inputItem() const; - void setInputItem(QObject *inputItemChanged); + QT_DEPRECATED QObject *inputItem() const; + QT_DEPRECATED void setInputItem(QObject *inputItemChanged); // the window containing the editor - QWindow *inputWindow() const; + QT_DEPRECATED QWindow *inputWindow() const; QTransform inputItemTransform() const; void setInputItemTransform(const QTransform &transform); @@ -121,6 +121,9 @@ private: friend class QPlatformInputContext; QInputPanel(); ~QInputPanel(); + + Q_PRIVATE_SLOT(d_func(), void q_connectFocusObject()); + Q_PRIVATE_SLOT(d_func(), void q_checkFocusObject(QObject* object)); }; QT_END_NAMESPACE |