diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-11 11:11:45 (GMT) |
| commit | b42da2ec8677ce67ecd5d5f8188537e2a597da2a (patch) | |
| tree | e41b2eb449e0d0392e85603612836d935967f400 /src/gui/graphicsview/qgraphicswidget_p.h | |
| parent | 664c78144754c499d07a95c3914fd34202bf4b98 (diff) | |
| parent | 343de9228ae65c36c4a9a45297d45cdeb04a8e44 (diff) | |
| download | Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.zip Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.gz Qt-b42da2ec8677ce67ecd5d5f8188537e2a597da2a.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index eb53649..65e6962 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -98,7 +98,7 @@ public: mutable qreal *margins; void ensureMargins() const; - void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *newScene = 0); + void fixFocusChainBeforeReparenting(QGraphicsWidget *newParent, QGraphicsScene *oldScene, QGraphicsScene *newScene = 0); void setLayout_helper(QGraphicsLayout *l); // Layouts |