diff options
| author | Simon Hausmann <[email protected]> | 2014-02-11 11:08:11 +0100 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2014-02-11 12:00:31 +0100 |
| commit | 7c9497a6d47a02d961baef3993ba4cf4267ec607 (patch) | |
| tree | 335fae3e9e3a84d33310efca23f1d6993265805b /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 67ba88947f57ab2d1859bbeb96c6dcba020561b1 (diff) | |
| parent | 6c840c70d61c3ae277b60a024a086215c743e5b3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp
Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 652c0f00ac..efe1dff19c 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -304,7 +304,7 @@ ReturnedValue ArrayPrototype::method_push(CallContext *ctx) if (!ctx->callData->argc) { ; - } else if (!instance->protoHasArray() && instance->arrayData->length() <= len) { + } else if (!instance->protoHasArray() && instance->arrayData->length() <= len && instance->arrayType() == ArrayData::Simple) { instance->arrayData->vtable()->putArray(instance.getPointer(), len, ctx->callData->args, ctx->callData->argc); len = instance->arrayData->length(); } else { |