summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qguiapplication.h
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2012-01-20 17:57:21 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-27 13:27:54 +0100
commitdd565d2d4c7e9b766bc9f575d803ebaad71b33b7 (patch)
treeb81f8b84e26c8b433759e6f97cdcacd0c5419dd0 /src/gui/kernel/qguiapplication.h
parente7d0d54084aa04387ebfb8cee292248df5355021 (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/qguiapplication.h')
-rw-r--r--src/gui/kernel/qguiapplication.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index e06df1de58..c858cfe1f0 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -88,6 +88,7 @@ public:
static QT_DEPRECATED QWindow *activeWindow() { return focusWindow(); }
#endif
static QWindow *focusWindow();
+ static QObject *focusObject();
static QScreen *primaryScreen();
static QList<QScreen *> screens();
@@ -133,6 +134,7 @@ Q_SIGNALS:
void fontDatabaseChanged();
void screenAdded(QScreen *screen);
void lastWindowClosed();
+ void focusObjectChanged(QObject *focusObject);
protected:
bool event(QEvent *);