diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 17:42:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-14 17:42:25 (GMT) |
| commit | 463cd4f6563dc12d8b45bf2e293dc64d583e132c (patch) | |
| tree | 1d1a6123f42fe8843f32c572cd3d1c4fb42aefcd /src/gui/graphicsview/qgraphicswidget_p.cpp | |
| parent | 4879551f72a377e0816164ce1762eb646839f4a6 (diff) | |
| parent | 0295f8da10d6c920511d09f9e506b8bed8c444c3 (diff) | |
| download | Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.zip Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.tar.gz Qt-463cd4f6563dc12d8b45bf2e293dc64d583e132c.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget_p.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index b747a30..5b6490f 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -743,7 +743,7 @@ bool QGraphicsWidgetPrivate::hasDecoration() const /** * is called after a reparent has taken place to fix up the focus chain(s) */ -void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *newScene) +void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene) { Q_Q(QGraphicsWidget); @@ -789,7 +789,7 @@ void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *new // update tabFocusFirst for oldScene if the item is going to be removed from oldScene if (newParent) newScene = newParent->scene(); - QGraphicsScene *oldScene = q->scene(); + if (oldScene && newScene != oldScene) oldScene->d_func()->tabFocusFirst = firstOld; |