diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-01-28 09:55:46 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-01-28 09:55:46 (GMT) |
| commit | a0f790009ae9a1e085169d81ae7f9017142b49ad (patch) | |
| tree | 9ea3267a7e2a2d5b7b2f6d13212f08a8a01a278b /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | f3ad942805cd976912ac8395ef526430b9db6350 (diff) | |
| parent | 692e12b928fa94209a38afc7693be3469bc57039 (diff) | |
| download | Qt-a0f790009ae9a1e085169d81ae7f9017142b49ad.zip Qt-a0f790009ae9a1e085169d81ae7f9017142b49ad.tar.gz Qt-a0f790009ae9a1e085169d81ae7f9017142b49ad.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 10d31ea..9773404 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7253,7 +7253,9 @@ void QGraphicsItem::prepareGeometryChange() QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func(); scenePrivate->index->prepareBoundingRectChange(this); - scenePrivate->markDirty(this, QRectF(), /*invalidateChildren=*/true); + scenePrivate->markDirty(this, QRectF(), /*invalidateChildren=*/true, /*force=*/false, + /*ignoreOpacity=*/ false, /*removingItemFromScene=*/ false, + /*updateBoundingRect=*/true); // For compatibility reasons, we have to update the item's old geometry // if someone is connected to the changed signal or the scene has no views. |