diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-07 11:03:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 11:03:01 +0100 |
| commit | 3e3c6717ba634825a65069541500c40645a808ee (patch) | |
| tree | ed47bf1c276e81f5585b4ac139f6bf2a09c1a437 /src/qml/jsruntime/qv4value_p.h | |
| parent | 6fe4c1f2803abac74da152b9a5656eff2d71dceb (diff) | |
| parent | c6b3c69e014f846a142c2429cd2d675c75b74245 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Change-Id: I3b250545e334f50dcef1a75acdef51820d34079a
Diffstat (limited to 'src/qml/jsruntime/qv4value_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 50cecb6598..1158b82318 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -56,6 +56,8 @@ #include "qv4global_p.h" #include <private/qv4heap_p.h> +#include <private/qnumeric_p.h> + #if QT_POINTER_SIZE == 8 #define QV4_USE_64_BIT_VALUE_ENCODING #endif @@ -362,6 +364,8 @@ public: return d; } QML_NEARLY_ALWAYS_INLINE void setDouble(double d) { + if (qt_is_nan(d)) + d = qt_qnan(); memcpy(&_val, &d, 8); #ifdef QV4_USE_64_BIT_VALUE_ENCODING _val ^= NaNEncodeMask; |