diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
commit | 968f7c0e65a293a7d7b9a87601e853894d9794ed (patch) | |
tree | 3a86b71dd69cf4b759bb20b62c18cfeb02a28ef0 /src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | |
parent | 3481db791c3b48e28f1a9531b247adf6562edb71 (diff) | |
parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
download | Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.zip Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.gz Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.bz2 |
Merge branch '4.6' into 4.6-platform
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp index 39a4093..699c1cd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp @@ -110,7 +110,10 @@ char* JSValue::description() { static const size_t size = 32; static char description[size]; - if (isInt32()) + + if (!*this) + snprintf(description, size, "<JSValue()>"); + else if (isInt32()) snprintf(description, size, "Int32: %d", asInt32()); else if (isDouble()) snprintf(description, size, "Double: %lf", asDouble()); |