Merge remote-tracking branch 'origin/dev' into new-backend

Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c

1 files changed, 3 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index 2ac4409805..ca5340c37d 100644
--- a/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@ -197,7 +197,9 @@ ReturnedValue NumberPrototype::method_isNaN(const BuiltinFunction *, CallData *c
         return Encode(false);
 
     double v = callData->args[0].toNumber();
-    return 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.
+    return Encode(bool(std::isnan(v)));
 }
 
 ReturnedValue NumberPrototype::method_toString(const BuiltinFunction *b, CallData *callData)