diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
commit | 97d28c26ba981332f51ab81024bb8b0224afeb81 (patch) | |
tree | 9c03fd067695043b3a061ad192b6f45e2cf6ecba /src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | |
parent | d48c3129992bf4b962201fa908f37f0e2a61f7c4 (diff) | |
parent | 180d9189e8098d98848367f673fff723ddd1d068 (diff) | |
download | Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.zip Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.gz Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.bz2 |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public 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()); |