summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-07-20 22:46:43 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-07-20 22:46:43 (GMT)
commit7725da34a828df00feb289515c11fa8aea1a55d8 (patch)
tree14913879d35ec36006e36aea62fde62f5d59e23c
parent4d344bbc7a780e861f83962a166e82a0648813f1 (diff)
downloadQt-7725da34a828df00feb289515c11fa8aea1a55d8.zip
Qt-7725da34a828df00feb289515c11fa8aea1a55d8.tar.gz
Qt-7725da34a828df00feb289515c11fa8aea1a55d8.tar.bz2
Restore the FLT_MAX define.
Seems some platforms don't have it.
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 86ef0df..54aa3a9 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -64,6 +64,10 @@
#include <QtGui/qgraphicstransform.h>
#include <qlistmodelinterface_p.h>
+#ifndef FLT_MAX
+#define FLT_MAX 1E+37
+#endif
+
QT_BEGIN_NAMESPACE
/*!
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 7e4a36f..67de288 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -47,6 +47,10 @@
#include <QGraphicsSceneMouseEvent>
#include <QtCore/qmath.h>
+#ifndef FLT_MAX
+#define FLT_MAX 1E+37
+#endif
+
QT_BEGIN_NAMESPACE
static const int PressAndHoldDelay = 800;