diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 17:24:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 17:24:36 (GMT) |
| commit | 8a86878ddae7584999d22463f8b7583e35ed9ecd (patch) | |
| tree | dd6ad61bbf99a8d72dae91984b3c058b2c9d4250 /src | |
| parent | ad4535cf5a053ad3ccf6fe6641da7632b1976160 (diff) | |
| parent | 46ede046a34c822c612c55fdb1dc93dffe3fc6b6 (diff) | |
| download | Qt-8a86878ddae7584999d22463f8b7583e35ed9ecd.zip Qt-8a86878ddae7584999d22463f8b7583e35ed9ecd.tar.gz Qt-8a86878ddae7584999d22463f8b7583e35ed9ecd.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.
Diffstat (limited to 'src')
| -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)); } |