summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Bugge Monsen <mmonsen@trolltech.com>2009-06-22 12:34:29 (GMT)
committerMarius Bugge Monsen <mmonsen@trolltech.com>2009-06-22 12:34:29 (GMT)
commitbbc8e0c87e0969478ad958684a4111920ccd6567 (patch)
tree4dcf938e92c2f34be66b25db4ead69d41cf76b6b
parent120252acef2d81d0046b421ad2cc1455975c0052 (diff)
downloadQt-bbc8e0c87e0969478ad958684a4111920ccd6567.zip
Qt-bbc8e0c87e0969478ad958684a4111920ccd6567.tar.gz
Qt-bbc8e0c87e0969478ad958684a4111920ccd6567.tar.bz2
Check for null pointer in QGraphicsProxyWidget::event() in case there is no focusWidget().
Reviewed-by: Thierry Task-number: 255468
-rw-r--r--src/gui/graphicsview/qgraphicsproxywidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index 98fe51d..65f315c 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -840,7 +840,7 @@ bool QGraphicsProxyWidget::event(QEvent *event)
// ### Qt 4.5: this code must also go into a reimplementation
// of inputMethodEvent().
QWidget *focusWidget = d->widget->focusWidget();
- if (focusWidget->testAttribute(Qt::WA_InputMethodEnabled))
+ if (focusWidget && focusWidget->testAttribute(Qt::WA_InputMethodEnabled))
QApplication::sendEvent(focusWidget, event);
break;
}