diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-30 13:48:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 16:07:33 +0200 |
| commit | 430dfd326cb9d8dab8ebd11e83dd52e6d55c4229 (patch) | |
| tree | 0d1dd82ddf8f027a591e93def6ce369237af725a /src/qml/types/qqmldelegatemodel.cpp | |
| parent | 3dc090fc1eb0a810d96ffc87e4662f7eb9ac8fd2 (diff) | |
Fix ObjectIterator API to be GC safe
Change-Id: I3a9c48d53d8dbadcb9b32c00fcef1f89447c4b8c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qqmldelegatemodel.cpp')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index f929880f58..b87ed63f2b 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1557,14 +1557,13 @@ bool QQmlDelegateModelPrivate::insert(Compositor::insert_iterator &before, const if (!o) return false; - QV4::ObjectIterator it(o.getPointer(), QV4::ObjectIterator::EnumerableOnly|QV4::ObjectIterator::WithProtoChain); + QV4::ObjectIterator it(scope, o, QV4::ObjectIterator::EnumerableOnly|QV4::ObjectIterator::WithProtoChain); QV4::ScopedValue propertyName(scope); + QV4::ScopedValue v(scope); while (1) { - QV4::Value value; - propertyName = it.nextPropertyNameAsString(&value); + propertyName = it.nextPropertyNameAsString(v); if (propertyName->isNull()) break; - QV4::ScopedValue v(scope, value); cacheItem->setValue(propertyName->toQStringNoThrow(), m_cacheMetaType->v8Engine->toVariant(v, QVariant::Invalid)); } |