diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-14 03:08:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-14 03:08:43 (GMT) |
| commit | 8062464ce3f5fd6eb92f94d1fafa697385de72ce (patch) | |
| tree | 93b18323a9bc1d1b990e71dc6b27013e07bff68d | |
| parent | 4f2538b2785e19f391ecdb9694970d3cae3c835f (diff) | |
| parent | 8a86878ddae7584999d22463f8b7583e35ed9ecd (diff) | |
| download | Qt-8062464ce3f5fd6eb92f94d1fafa697385de72ce.zip Qt-8062464ce3f5fd6eb92f94d1fafa697385de72ce.tar.gz Qt-8062464ce3f5fd6eb92f94d1fafa697385de72ce.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Proper fix for QGraphicsItem crash.
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 5 |
1 files 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)); } |