diff options
| author | Yoann Lopes <yoann.lopes@nokia.com> | 2010-03-03 10:56:56 (GMT) |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@nokia.com> | 2010-03-03 10:56:56 (GMT) |
| commit | 388bd11da343f5e7bc9928bc1151de18bc01fe7f (patch) | |
| tree | d6d7e3b9e577753b89169869a1976fa92a8dbfc6 /src | |
| parent | 9957e85e37345e946ecc67196d65fbca867a2001 (diff) | |
| download | Qt-388bd11da343f5e7bc9928bc1151de18bc01fe7f.zip Qt-388bd11da343f5e7bc9928bc1151de18bc01fe7f.tar.gz Qt-388bd11da343f5e7bc9928bc1151de18bc01fe7f.tar.bz2 | |
Revert "Fixes crash when destroying a QGraphicsItem."
The patch was wrong. The new one is pushed into 4.6. The old one
is reverted to avoid merge conflicts.
This reverts commit a7ef2d899d711d750238a8d69284da808188b407.
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 5735cd6..4f06f80 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3179,9 +3179,8 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim */ void QGraphicsItem::clearFocus() { - // Pass focus to the closest parent focus scope when clearing focus - // from a focus scope. - if (!d_ptr->inDestructor && (d_ptr->flags & ItemIsFocusScope)) { + // Pass focus to the closest parent focus scope. + if (!d_ptr->inDestructor) { QGraphicsItem *p = d_ptr->parent; while (p) { if (p->flags() & ItemIsFocusScope) { |