Commit 9ca4af5c authored by Tobias Koenig's avatar Tobias Koenig Committed by Qt by Nokia

Fix compilation on QNX.

Change-Id: I5e01cad23066a645c1434ce1463d370733f53e4f
Reviewed-by: 's avatarAlan Alpert <alan.alpert@nokia.com>
parent d268ac6f
......@@ -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
}
......
......@@ -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.
......
......@@ -41,6 +41,10 @@
#include "qqmlpool_p.h"
#ifdef Q_OS_QNX
#include <malloc.h>
#endif
// #define POOL_DEBUG
QT_BEGIN_NAMESPACE
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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;
/*!
......
......@@ -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
......
......@@ -46,6 +46,10 @@
#include <qopenglfunctions.h>
#include <private/qopenglextensions_p.h>
#ifdef Q_OS_QNX
#include <malloc.h>
#endif
QT_BEGIN_NAMESPACE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment