diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
| commit | 4d1a9b18b905f21b70608b13f4789dadec6bc181 (patch) | |
| tree | bfa0d9364432b0c4fc55648acc0f99a3a12e42f9 /src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | |
| parent | a6a8e2b1918b2037c9d79e59aabf04ef09bee73e (diff) | |
| parent | 6e84a8f0d93f178611a40917fec92648e956fe38 (diff) | |
| download | Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.zip Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.tar.gz Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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()); |