From b325c90e5a0e5088aa8723d943f4c38b14048bd7 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 21 Jul 2010 09:18:21 +1000
Subject: Compile: include <float.h> for usage of FLT_MAX.

---
 src/declarative/graphicsitems/qdeclarativeitem.cpp      | 5 +----
 src/declarative/graphicsitems/qdeclarativemousearea.cpp | 5 +----
 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;
-- 
cgit v0.12