Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix compilation on QNX.
Change-Id: I5e01cad23066a645c1434ce1463d370733f53e4f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
  • Loading branch information
Tobias Koenig authored and Qt by Nokia committed Mar 20, 2012
1 parent d268ac6 commit 9ca4af5
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/3rdparty/javascriptcore/DateMath.cpp
Expand Up @@ -345,8 +345,15 @@ double timeClip(double t)
return NaN;
return t >= 0 ? floor(t) : ceil(t);
#else

#if defined(__QNXNTO__)
if (!isfinite(t) || fabs(t) > maxECMAScriptTime)
return NaN;
#else
if (!std::isfinite(t) || fabs(t) > maxECMAScriptTime)
return NaN;
#endif

return trunc(t);
#endif
}
Expand Down
4 changes: 4 additions & 0 deletions src/qml/qml/ftw/qhashedstring_p.h
Expand Up @@ -59,6 +59,10 @@

#include <private/qflagpointer_p.h>

#if defined(Q_OS_QNX)
#include <stdlib.h>
#endif

QT_BEGIN_NAMESPACE

// Enable this to debug hash linking assumptions.
Expand Down
4 changes: 4 additions & 0 deletions src/qml/qml/ftw/qqmlpool.cpp
Expand Up @@ -41,6 +41,10 @@

#include "qqmlpool_p.h"

#ifdef Q_OS_QNX
#include <malloc.h>
#endif

// #define POOL_DEBUG

QT_BEGIN_NAMESPACE
Expand Down
4 changes: 4 additions & 0 deletions src/qml/qml/qqmlaccessors_p.h
Expand Up @@ -47,6 +47,10 @@
#include <QtCore/qhash.h>
#include <QtCore/QReadWriteLock>

#ifdef Q_OS_QNX
#include <stdint.h>
#endif

QT_BEGIN_HEADER

QT_BEGIN_NAMESPACE
Expand Down
4 changes: 4 additions & 0 deletions src/qml/qml/v8/qjsconverter_impl_p.h
Expand Up @@ -44,6 +44,10 @@
#ifndef QJSCONVERTER_IMPL_P_H
#define QJSCONVERTER_IMPL_P_H

#ifdef Q_OS_QNX
#include <malloc.h>
#endif

QT_BEGIN_NAMESPACE

extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **digits_str);
Expand Down
4 changes: 4 additions & 0 deletions src/quick/items/context2d/qquickcontext2d.cpp
Expand Up @@ -63,6 +63,10 @@
#include <private/qv8domerrors_p.h>
#include <QtCore/qnumeric.h>

#ifdef Q_OS_QNX
#include <ctype.h>
#endif

QT_BEGIN_NAMESPACE
/*!
\qmlclass Context2D QQuickContext2D
Expand Down
3 changes: 3 additions & 0 deletions src/quick/particles/qquickangledirection.cpp
Expand Up @@ -42,6 +42,9 @@
#include "qquickangledirection_p.h"
#include <stdlib.h>
#include <cmath>
#ifdef Q_OS_QNX
#include <math.h>
#endif
QT_BEGIN_NAMESPACE
const qreal CONV = 0.017453292519943295;
/*!
Expand Down
5 changes: 5 additions & 0 deletions src/quick/particles/qquickellipseextruder.cpp
Expand Up @@ -42,6 +42,11 @@
#include "qquickellipseextruder_p.h"
#include <stdlib.h>
#include <cmath>

#ifdef Q_OS_QNX
#include <math.h>
#endif

QT_BEGIN_NAMESPACE
/*!
\qmlclass EllipseShape QQuickEllipseExtruder
Expand Down
4 changes: 4 additions & 0 deletions src/quick/scenegraph/coreapi/qsggeometry.cpp
Expand Up @@ -46,6 +46,10 @@
#include <qopenglfunctions.h>
#include <private/qopenglextensions_p.h>

#ifdef Q_OS_QNX
#include <malloc.h>
#endif

QT_BEGIN_NAMESPACE


Expand Down

0 comments on commit 9ca4af5

Please sign in to comment.