diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/accessible/qaccessibleobject.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qinputmethod.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp index db4ee242ff..22c8ba5321 100644 --- a/src/gui/accessible/qaccessibleobject.cpp +++ b/src/gui/accessible/qaccessibleobject.cpp @@ -243,7 +243,7 @@ QAccessibleInterface *QAccessibleApplication::child(int index) const /*! \reimp */ QAccessibleInterface *QAccessibleApplication::focusChild() const { - if (QWindow *window = QGuiApplication::activeWindow()) + if (QWindow *window = QGuiApplication::focusWindow()) return window->accessibleRoot(); return 0; } diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fac466b0fd..91c2a9d99b 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1248,7 +1248,7 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE QWindow *window = e->window.data(); modifier_buttons = e->modifiers; if (e->nullWindow) - window = QGuiApplication::activeWindow(); + window = QGuiApplication::focusWindow(); if (!window) return; if (window->d_func()->blockedByModalWindow) { diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp index c443a47cac..1144c798e2 100644 --- a/src/gui/kernel/qinputmethod.cpp +++ b/src/gui/kernel/qinputmethod.cpp @@ -112,7 +112,7 @@ void QInputMethod::setInputItem(QObject *inputItem) */ QWindow *QInputMethod::inputWindow() const { - return qApp->activeWindow(); + return qApp->focusWindow(); } /*! |