diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-28 13:25:56 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 07:39:24 +0100 |
| commit | ed9db939b1fe5ea2f620a4992abdbc553fa3ac41 (patch) | |
| tree | bd51a5b09a6615ca3e302a27916b51c8681064a6 /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | 9b43867c06ed56ff3c636892af43013842ea12a1 (diff) | |
Fix the way we set the property name during iteration
This was broken due to the new inheritance scheme for Managed
Change-Id: Ia9df50e7e655c3a812a01a2c78945e648aa444dc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index dec361a09c..e148782d4c 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -122,9 +122,9 @@ bool StringObject::deleteIndexedProperty(Managed *m, uint index) return true; } -void StringObject::advanceIterator(Managed *m, ObjectIterator *it, String *&name, uint *index, Property *p, PropertyAttributes *attrs) +void StringObject::advanceIterator(Managed *m, ObjectIterator *it, Heap::String **name, uint *index, Property *p, PropertyAttributes *attrs) { - name = (String *)0; + *name = (Heap::String *)0; StringObject *s = static_cast<StringObject *>(m); uint slen = s->d()->value.stringValue()->toQString().length(); if (it->arrayIndex <= slen) { |