diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:26:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 16:31:13 +0100 |
| commit | 4d525de33e2ee55e69bb6c90fc11049a0f8b36b5 (patch) | |
| tree | c9808baeabb1121f488a7b59ffff314cc62d80e8 /src/qml/jsruntime/qv4value_p.h | |
| parent | 47cd9da96371ccd495f6caabe1c6853258210ebb (diff) | |
| parent | 3e3c6717ba634825a65069541500c40645a808ee (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/imports/shapes/qquickshape.cpp
src/imports/shapes/qquickshape_p_p.h
src/qml/compiler/qqmlpropertycachecreator_p.h
src/qml/jsruntime/qv4value_p.h
src/quick/items/qquickloader_p.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tools/qmlprofiler/qmlprofilerapplication.cpp
Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69
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 843fbc1d91..b3f04d69be 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -57,6 +57,8 @@ #include "qv4global_p.h" #include <private/qv4heap_p.h> +#include <private/qnumeric_p.h> + QT_BEGIN_NAMESPACE namespace QV4 { @@ -322,6 +324,8 @@ public: return d; } QML_NEARLY_ALWAYS_INLINE void setDouble(double d) { + if (qt_is_nan(d)) + d = qt_qnan(); memcpy(&_val, &d, 8); _val ^= NaNEncodeMask; Q_ASSERT(isDouble()); |