diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
| commit | 0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (patch) | |
| tree | 046ad0fdf693107efb75a0ecd03f6cbc3dd00680 /src/gui | |
| parent | c2c69c117407990e5c2d8900f4aa27979273084a (diff) | |
| parent | a18ebd2a70e83863bc9a8cc64a65791a6d879f02 (diff) | |
| download | Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.zip Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.gz Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 2876016..5e33896 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -1691,6 +1691,7 @@ void QGraphicsView::setScene(QGraphicsScene *scene) disconnect(d->scene, SIGNAL(sceneRectChanged(QRectF)), this, SLOT(updateSceneRect(QRectF))); d->scene->d_func()->views.removeAll(this); + d->connectedToScene = false; } // Assign the new scene and update the contents (scrollbars, etc.)). |