summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp7
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp5
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 6835427..f26496e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -57,13 +57,12 @@
#include <QFile>
#include <QEvent>
#include <QGraphicsSceneMouseEvent>
+#include <QtCore/qnumeric.h>
#include <QtScript/qscriptengine.h>
#include <QtGui/qgraphicstransform.h>
#include <QtGui/qgraphicseffect.h>
#include <qlistmodelinterface_p.h>
-#include <math.h>
-
QT_BEGIN_NAMESPACE
#ifndef FLT_MAX
@@ -2845,7 +2844,7 @@ qreal QmlGraphicsItem::width() const
void QmlGraphicsItem::setWidth(qreal w)
{
Q_D(QmlGraphicsItem);
- if (isnan(w))
+ if (qIsNaN(w))
return;
d->widthValid = true;
@@ -2917,7 +2916,7 @@ qreal QmlGraphicsItem::height() const
void QmlGraphicsItem::setHeight(qreal h)
{
Q_D(QmlGraphicsItem);
- if (isnan(h))
+ if (qIsNaN(h))
return;
d->heightValid = true;
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));