summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-02-10 16:39:59 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-02-10 16:40:33 (GMT)
commit1407f3c1815addf6b9cac7503d38b670bbeab895 (patch)
tree4ddbd0b84088fdd424344c00350cde916e8f9b9a
parent620dd47c3b790b99f76793f4b4e6f22e3984558e (diff)
downloadQt-1407f3c1815addf6b9cac7503d38b670bbeab895.zip
Qt-1407f3c1815addf6b9cac7503d38b670bbeab895.tar.gz
Qt-1407f3c1815addf6b9cac7503d38b670bbeab895.tar.bz2
Fix the WebKit build
It's PLATFORM(SYMBIAN) in 4.x, not OS() like in the trunk Reviewed-by: Trust me
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp
index 502312c..bafb85b 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp
@@ -174,7 +174,7 @@ uint32_t toUInt32SlowCase(double d, bool& ok)
NEVER_INLINE double nonInlineNaN()
{
-#if OS(SYMBIAN)
+#if PLATFORM(SYMBIAN)
return nanval();
#else
return std::numeric_limits<double>::quiet_NaN();