diff options
author | Anselmo L. S. Melo <anselmo.melo@openbossa.org> | 2012-03-08 20:01:24 -0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 15:13:45 +0100 |
commit | 8b5218a1e9136d6889d3e57b37b5341b4bcf6df0 (patch) | |
tree | 8b00816d0f03a4843b2c387a433b56949e8b24d5 /src/gui | |
parent | 1741f6890c9ad51c7541fff8fed450c8c4da9654 (diff) |
Make QWindow::isActive return false when the application loses the focus
In QTBUG-24807 there is a test case that shows a case when a segmentation
fault happens inside isAncestorOf. When the whole application loses the
focus, e.g. when it is minimized or other application receives the focus,
QGuiApplication::focusWindow() returns a null pointer, so we need to
do a check before proceed inside of isActive.
Task-number: QTBUG-24807
Change-Id: I732c92bb9f236804ede5e89592f6e6609a4711b9
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qwindow.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 367cee70e3..91eb7bdb88 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -597,6 +597,11 @@ bool QWindow::isActive() const return false; QWindow *focus = QGuiApplication::focusWindow(); + + // Means the whole application lost the focus + if (!focus) + return false; + if (focus == this) return true; |