diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-03 05:25:14 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-03 05:25:14 (GMT) |
| commit | 135e8cd5be1b15a265f11f9e5dc99091d64dc090 (patch) | |
| tree | 2eaaf42f8f01b71e28aab2c54157125591935989 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 28093fa09de04d0633c261a91fd3746c107963fc (diff) | |
| parent | 76f8d4eba12cd806270c145f908c96d4cd1c72cf (diff) | |
| download | Qt-135e8cd5be1b15a265f11f9e5dc99091d64dc090.zip Qt-135e8cd5be1b15a265f11f9e5dc99091d64dc090.tar.gz Qt-135e8cd5be1b15a265f11f9e5dc99091d64dc090.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of 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.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 94e9fdd..500bdd0 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -668,6 +668,7 @@ #include <QtCore/qtimer.h> #include <QtCore/qvariant.h> #include <QtCore/qvarlengtharray.h> +#include <QtCore/qnumeric.h> #include <QtGui/qapplication.h> #include <QtGui/qbitmap.h> #include <QtGui/qpainter.h> @@ -3439,7 +3440,7 @@ void QGraphicsItem::setX(qreal x) if (d_ptr->inDestructor) return; - if (isnan(x)) + if (qIsNaN(x)) return; d_ptr->setPosHelper(QPointF(x, d_ptr->pos.y())); @@ -3466,7 +3467,7 @@ void QGraphicsItem::setY(qreal y) if (d_ptr->inDestructor) return; - if (isnan(y)) + if (qIsNaN(y)) return; d_ptr->setPosHelper(QPointF(d_ptr->pos.x(), y)); |