diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:22 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:22 (GMT) |
| commit | a4fc9805bd1dd8798ccb2918e4dbd3ed8b0ca2f9 (patch) | |
| tree | cde3a64dd68b32f5dfc7d39cfa62a59ec3f90974 /src/gui/graphicsview | |
| parent | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (diff) | |
| parent | 5b3eed36952f6c8b966b709e5630385c3b13715b (diff) | |
| download | Qt-a4fc9805bd1dd8798ccb2918e4dbd3ed8b0ca2f9.zip Qt-a4fc9805bd1dd8798ccb2918e4dbd3ed8b0ca2f9.tar.gz Qt-a4fc9805bd1dd8798ccb2918e4dbd3ed8b0ca2f9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index c3934c7..13b677c 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3120,6 +3120,9 @@ QPointF QGraphicsItem::pos() const */ void QGraphicsItem::setX(qreal x) { + if (d_ptr->inDestructor) + return; + d_ptr->setPosHelper(QPointF(x, d_ptr->pos.y())); } @@ -3141,6 +3144,9 @@ void QGraphicsItem::setX(qreal x) */ void QGraphicsItem::setY(qreal y) { + if (d_ptr->inDestructor) + return; + d_ptr->setPosHelper(QPointF(d_ptr->pos.x(), y)); } @@ -3163,6 +3169,7 @@ QPointF QGraphicsItem::scenePos() const void QGraphicsItemPrivate::setPosHelper(const QPointF &pos) { Q_Q(QGraphicsItem); + inSetPosHelper = 1; updateCachedClipPathFromSetPosHelper(pos); if (scene) @@ -3206,6 +3213,9 @@ void QGraphicsItem::setPos(const QPointF &pos) if (d_ptr->pos == pos) return; + if (d_ptr->inDestructor) + return; + // Update and repositition. if (!(d_ptr->flags & ItemSendsGeometryChanges)) { d_ptr->setPosHelper(pos); |