From 46ede046a34c822c612c55fdb1dc93dffe3fc6b6 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@nokia.com>
Date: Thu, 13 Jan 2011 15:16:03 +0100
Subject: Proper fix for QGraphicsItem crash.

See 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7

Task-number: QTBUG-16374
Reviewed-by: TrustMe
---
 src/gui/graphicsview/qgraphicsitem.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index a892094..52e4d79 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -5592,9 +5592,8 @@ void QGraphicsItemPrivate::clearSubFocus(QGraphicsItem *rootItem, QGraphicsItem
         if (parent->d_ptr->subFocusItem != q_ptr)
             break;
         parent->d_ptr->subFocusItem = 0;
-        if (parent == stopItem)
-            break;
-        parent->d_ptr->subFocusItemChange();
+        if (parent != stopItem && !parent->isAncestorOf(stopItem))
+            parent->d_ptr->subFocusItemChange();
     } while (!parent->isPanel() && (parent = parent->d_ptr->parent));
 }
 
-- 
cgit v0.12