diff options
| author | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
| commit | 12e40dc6350ce37a6108c62d3c954a50df621dbd (patch) | |
| tree | 0fd5eb966de7b9124c1af2e9355ce8e594ad7b4d /src/gui/graphicsview | |
| parent | 574464cd7e2940f2dadc4d556e24b944cf222f3d (diff) | |
| parent | b0d54f150e9b4211e263b4835dd2c64ac07a8c86 (diff) | |
| download | Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.zip Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.gz Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
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); |