diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-20 23:18:21 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 07:05:38 (GMT) |
| commit | 6ae73e7d73b29c4ccfb62a9b2bcf42404c96948f (patch) | |
| tree | 1a25b6b1fe83d405b2baa39d14564edfc839332b | |
| parent | bf4cad4793a1d661785b0a53c78adfc6ab6a759a (diff) | |
| download | Qt-6ae73e7d73b29c4ccfb62a9b2bcf42404c96948f.zip Qt-6ae73e7d73b29c4ccfb62a9b2bcf42404c96948f.tar.gz Qt-6ae73e7d73b29c4ccfb62a9b2bcf42404c96948f.tar.bz2 | |
Compile: include <float.h> for usage of FLT_MAX.
(cherry picked from commit b325c90e5a0e5088aa8723d943f4c38b14048bd7)
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 5 | ||||
| -rw-r--r-- | 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 1f97783..89484b2 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; |