diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
commit | 82913414623f36acb3d2c07d6c124af9f61fcdb4 (patch) | |
tree | 610f66dd1fcb487e20bbf18587e8cfad38a40826 /src/qml/jsruntime/qv4jsonobject.cpp | |
parent | d34098d8981d9103626ff7264e7b5ec084bfb63e (diff) | |
parent | f95fdacb3a12e4f0d37d3c32b34326f2bd1536de (diff) |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 2383709b4f..6633435668 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -284,8 +284,13 @@ bool JsonParser::parseMember(ObjectRef o) return false; ScopedString s(scope, context->engine->newIdentifier(key)); - Property *p = o->insertMember(s, Attr_Data); - p->value = val.asReturnedValue(); + uint idx = s->asArrayIndex(); + if (idx < UINT_MAX) { + o->putIndexed(idx, val); + } else { + Property *p = o->insertMember(s, Attr_Data); + p->value = val.asReturnedValue(); + } END; return true; |