diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-02 17:11:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 22:23:25 +0100 |
| commit | 26db9863f18d7f7e89cec88b720e4fb4c674dd5b (patch) | |
| tree | fe5443f04e6c6adf47ac45e2e46b7c3965faf08a /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | 4ffa7d3f651757b7bc10ae9801b7802a8f2e260f (diff) | |
Optimise string additions
Small optimisation for string additions, also add one more check
for exceptions in the code where required.
Change-Id: I6c14bc88ea5d03f7eeed0e0168c5195f9f823693
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 8d693f7705..c4d1ebc545 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -926,7 +926,7 @@ ReturnedValue JsonObject::method_stringify(SimpleCallContext *ctx) for (uint i = 0; i < arrayLen; ++i) { v = o->getIndexed(i); if (v->asNumberObject() || v->asStringObject() || v->isNumber()) - v = __qmljs_to_string(v, ctx); + v = __qmljs_to_string(ctx, v); if (v->isString()) { String *s = v->stringValue(); if (!stringify.propertyList.contains(s)) |