summaryrefslogtreecommitdiff
path: root/src/widgets/kernel/qwidget.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-10-09 10:35:19 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-10 06:50:23 +0200
commit187b61d879129f79da5dbc57805600d5159b1740 (patch)
treebfe94d6dff8d8a9740a1bbb1448950358688d76f /src/widgets/kernel/qwidget.cpp
parentfb029eeac6c6e6d25d8a50087cdb3106cb8c275a (diff)
downloadqtbase-187b61d879129f79da5dbc57805600d5159b1740.tar.gz
Don't try to emit focusObjectChanged if window pointer is zero
Task-number: QTBUG-27414 Change-Id: I75ad662e0a66d61b49d55d084f29cefc98221b7f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
-rw-r--r--src/widgets/kernel/qwidget.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index fa055bb210..362a8f4e55 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -5993,8 +5993,10 @@ void QWidget::setFocus(Qt::FocusReason reason)
f->d_func()->updateFocusChild();
}
- if (QTLWExtra *extra = f->window()->d_func()->maybeTopData())
- emit extra->window->focusObjectChanged(f);
+ if (QTLWExtra *extra = f->window()->d_func()->maybeTopData()) {
+ if (extra->window)
+ emit extra->window->focusObjectChanged(f);
+ }
}
// updates focus_child on parent widgets to point into this widget