summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-07-16 11:34:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-16 12:16:19 +0200
commitef93397d7039ef7b4f4f1d41dcb4e5f50cb8481b (patch)
treec520e7bb86495879b7eb3b5dbaaddb6329b929ea /src
parent4a212be6f0837b45800ca86e8658b8842af0af18 (diff)
Mac OS: Fix a crash in tst_qgraphicsproxywidget.
Change-Id: Ie93d77f00ee1e6a04ac20794e4d2d1e63cbdb636 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index 1898ecba68..0ed0b0ec3f 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -356,6 +356,9 @@ QWidget *QGraphicsProxyWidgetPrivate::findFocusChild(QWidget *child, bool next)
}
}
+ if (!child)
+ return 0;
+
QWidget *oldChild = child;
uint focus_flag = qt_tab_all_widgets() ? Qt::TabFocus : Qt::StrongFocus;
do {