aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-09-15 21:48:30 +0200
committerMorten Johan Sørvig <morten.sorvig@qt.io>2016-05-13 13:32:08 +0000
commitb6d3bae80317d854d78b5880d8d46cacd0d1a64e (patch)
tree4ecd01dac33105436efefd123247b02851918a60 /src/3rdparty
parent872a05475721ad771bd347d1526035e6e7479d30 (diff)
QtDeclarative fixes and workarounds for NaClwip/nacl
Make QtDeclarative run on Native Client. Some of these should be looked at more closely at a later point in time, but will do as workarounds from now. Change-Id: Ifddcb45b190c3a80c6137772a05ababb5466ea22 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/double-conversion/utils.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/double-conversion/utils.h b/src/3rdparty/double-conversion/utils.h
index 53eec64282..a14550c5d5 100644
--- a/src/3rdparty/double-conversion/utils.h
+++ b/src/3rdparty/double-conversion/utils.h
@@ -65,7 +65,8 @@
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
defined(__SH4__) || defined(__alpha__) || \
defined(_MIPS_ARCH_MIPS32R2) || \
- defined(__AARCH64EL__)
+ defined(__AARCH64EL__) || \
+ defined(__pnacl__)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
#if defined(_WIN32)