diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:30:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-15 21:37:14 +0200 |
| commit | 96b2323355a082599b7191f3079e8363bee825e0 (patch) | |
| tree | ec2c3737566802816eb8aed8539a354179394359 /src/qml/jsruntime/qv4numberobject.cpp | |
| parent | 83e9d165761ad68730722aeb0bffb8fabe555d1f (diff) | |
| parent | 0af2998cc99e90e3df34f794801340d8a769c735 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4engine.cpp
Change-Id: I5f7b63a937a214267e15ad5757844d662a4f981b
Diffstat (limited to 'src/qml/jsruntime/qv4numberobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4numberobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp index 8cfa930888..d5c80dbf80 100644 --- a/src/qml/jsruntime/qv4numberobject.cpp +++ b/src/qml/jsruntime/qv4numberobject.cpp @@ -213,7 +213,9 @@ void NumberPrototype::method_isNaN(const BuiltinFunction *, Scope &scope, CallDa } double v = callData->args[0].toNumber(); - scope.result = Encode(std::isnan(v)); + // cast to bool explicitly as std::isnan() may give us ::isnan(), which + // sometimes returns an int and we don't want the Encode(int) overload. + scope.result = Encode(bool(std::isnan(v))); } void NumberPrototype::method_toString(const BuiltinFunction *, Scope &scope, CallData *callData) |