diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-15 15:32:31 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-15 15:32:31 (GMT) |
| commit | 22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f (patch) | |
| tree | bcfc42bd2c2b813b32e1ace72ea1182fae634209 /src/gui/graphicsview | |
| parent | 8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5 (diff) | |
| parent | f86ca84e783c34e701f3742902161cb365e6e940 (diff) | |
| download | Qt-22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f.zip Qt-22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f.tar.gz Qt-22bfd2b05a72e1e7d7babcc9c5d824dd87903b6f.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 73e8eed..9ea0b83 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1157,7 +1157,6 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q if (q_ptr == fsi || q_ptr->isAncestorOf(fsi)) { parentFocusScopeItem = fsi; p->d_ptr->focusScopeItem = 0; - fsi->d_ptr->focusScopeItemChange(false); } break; } @@ -1261,6 +1260,10 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q if (!inDestructor && (transformData || (newParent && newParent->d_ptr->transformData))) transformChanged(); + // Reparenting is finished, now safe to notify the previous focusScopeItem about changes + if (parentFocusScopeItem) + parentFocusScopeItem->d_ptr->focusScopeItemChange(false); + // Restore the sub focus chain. if (subFocusItem) { subFocusItem->d_ptr->setSubFocus(newParent); |