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/qv4objectiterator_p.h | |
| 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/qv4objectiterator_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index 7710543114..f1f70d07a2 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -59,7 +59,7 @@ struct Q_QML_EXPORT ObjectIterator ObjectIterator(ExecutionEngine *e, Value *scratch1, Value *scratch2, Object *o, uint flags); ObjectIterator(Scope &scope, Object *o, uint flags); void init(Object *o); - void next(String *&name, uint *index, Property *pd, PropertyAttributes *attributes = 0); + void next(Heap::String **name, uint *index, Property *pd, PropertyAttributes *attributes = 0); ReturnedValue nextPropertyName(ValueRef value); ReturnedValue nextPropertyNameAsString(ValueRef value); ReturnedValue nextPropertyNameAsString(); |