diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-12-14 22:59:42 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-12-14 22:59:42 (GMT) |
| commit | 33d6cfe679d4374af90598a6003ac5bca3c032ef (patch) | |
| tree | 734c861a05d9e79bca54ecb8cb7a3c3cb209a576 /src/gui/graphicsview/qgraphicswidget_p.h | |
| parent | cce709287279a8dd5ac17ed4c9dd09ebb78c4f27 (diff) | |
| parent | 463cd4f6563dc12d8b45bf2e293dc64d583e132c (diff) | |
| download | Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.zip Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.gz Qt-33d6cfe679d4374af90598a6003ac5bca3c032ef.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt 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 |