diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-02-03 03:42:58 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-02-03 03:42:58 (GMT) |
| commit | 67c3a18b13eeadf60e9a07b9667ece5c17e9ab7e (patch) | |
| tree | f96f2fbd22d80fbe862b2539fd9db7246fd6b57f /src/declarative/graphicsitems/qmlgraphicsitem.cpp | |
| parent | c504440e135c9f67dfcf8acf6e0c6a4b53bf12ad (diff) | |
| download | Qt-67c3a18b13eeadf60e9a07b9667ece5c17e9ab7e.zip Qt-67c3a18b13eeadf60e9a07b9667ece5c17e9ab7e.tar.gz Qt-67c3a18b13eeadf60e9a07b9667ece5c17e9ab7e.tar.bz2 | |
Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan.
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem.cpp | 7 |
1 files changed, 3 insertions, 4 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; |