diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-15 08:24:36 (GMT) |
| commit | 22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch) | |
| tree | f84ff6878248c791319fc6be1f1956f2177b5bdb /src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | |
| parent | fa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff) | |
| parent | a14b8805945c5e00be26092406a468fd8b8acc14 (diff) | |
| download | Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp index 699c1cd..bafb85b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp @@ -174,7 +174,11 @@ uint32_t toUInt32SlowCase(double d, bool& ok) NEVER_INLINE double nonInlineNaN() { +#if PLATFORM(SYMBIAN) + return nanval(); +#else return std::numeric_limits<double>::quiet_NaN(); +#endif } } // namespace JSC |