aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@nokia.com>2011-11-16 14:43:28 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-16 15:46:26 +0100
commitea2e8abd5c655027da51548e0d0f2f55dfb947bc (patch)
tree57a5df55fc5358a2f035ae1b675537167f26d1d5 /src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
parent92660b13bb138d219f49ea203fa5e5aed9de74cb (diff)
Fix console.log function.
This patch fix problem of a truncated log message if it includes an object. The regression was introduced by a7f5c93de3f9811eef3f5a19ab6dec83b997e0d6. Change-Id: I080956ef3c902b6c4a57f5d0066c4616a449e661 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp')
-rw-r--r--src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
index fed0569039..84b42f6d7f 100644
--- a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
+++ b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
@@ -97,12 +97,14 @@ v8::Handle<v8::Value> console(ConsoleLogTypes logType, const v8::Arguments &args
if (value->IsObject() && !value->IsFunction()
&& !value->IsArray() && !value->IsDate()
&& !value->IsRegExp()) {
- result = QLatin1String("Object");
+ result.append(QLatin1String("Object"));
} else {
v8::Local<v8::String> jsstr = value->ToString();
- result.append(V8ENGINE()->toString(jsstr));
+ QString tmp = V8ENGINE()->toString(jsstr);
if (value->IsArray())
- result = QString(QLatin1String("[%1]")).arg(result);
+ result.append(QString::fromLatin1("[%1]").arg(tmp));
+ else
+ result.append(tmp);
}
}