summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-07-20 23:18:21 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-07-20 23:18:21 (GMT)
commitb325c90e5a0e5088aa8723d943f4c38b14048bd7 (patch)
treea40dc45970cb406dc50d3b16153d4a16389213fb /src/declarative/graphicsitems
parent7725da34a828df00feb289515c11fa8aea1a55d8 (diff)
downloadQt-b325c90e5a0e5088aa8723d943f4c38b14048bd7.zip
Qt-b325c90e5a0e5088aa8723d943f4c38b14048bd7.tar.gz
Qt-b325c90e5a0e5088aa8723d943f4c38b14048bd7.tar.bz2
Compile: include <float.h> for usage of FLT_MAX.
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp5
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 54aa3a9..1b0d7ef 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -59,14 +59,11 @@
#include <QEvent>
#include <QGraphicsSceneMouseEvent>
#include <QtCore/qnumeric.h>
-#include <QtCore/qmath.h>
#include <QtScript/qscriptengine.h>
#include <QtGui/qgraphicstransform.h>
#include <qlistmodelinterface_p.h>
-#ifndef FLT_MAX
-#define FLT_MAX 1E+37
-#endif
+#include <float.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 67de288..8ee6093 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -45,11 +45,8 @@
#include "private/qdeclarativeevents_p_p.h"
#include <QGraphicsSceneMouseEvent>
-#include <QtCore/qmath.h>
-#ifndef FLT_MAX
-#define FLT_MAX 1E+37
-#endif
+#include <float.h>
QT_BEGIN_NAMESPACE
static const int PressAndHoldDelay = 800;