summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-01 21:53:47 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-01 21:53:47 (GMT)
commite93f76cc533751944e66c02d868f3c527814efa0 (patch)
tree9a79f06ad7be400ff432a7edae33be4599a0658c /src/gui/graphicsview/qgraphicsitem.cpp
parentbd95a353c621cb7dba2f0991e742ddbde0bb9a54 (diff)
parent652be80c25f61aa4fbf28d75ba9971fc709f29c9 (diff)
downloadQt-e93f76cc533751944e66c02d868f3c527814efa0.zip
Qt-e93f76cc533751944e66c02d868f3c527814efa0.tar.gz
Qt-e93f76cc533751944e66c02d868f3c527814efa0.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index c53a893..3d81021 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -3425,6 +3425,9 @@ void QGraphicsItem::setX(qreal x)
if (d_ptr->inDestructor)
return;
+ if (isnan(x))
+ return;
+
d_ptr->setPosHelper(QPointF(x, d_ptr->pos.y()));
}
@@ -3449,6 +3452,9 @@ void QGraphicsItem::setY(qreal y)
if (d_ptr->inDestructor)
return;
+ if (isnan(y))
+ return;
+
d_ptr->setPosHelper(QPointF(d_ptr->pos.x(), y));
}