diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-15 08:46:38 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 12:00:39 +0100 |
| commit | 74c658bb631fd5bab433b9867ff2e568a56ec082 (patch) | |
| tree | cf82000446c51064a2f8643fd5ffd74b0bcca668 /src/qml/jsapi | |
| parent | 965fac4418bec7e7b3c84efd76f7803116fb9eac (diff) | |
Make Property uses GC safe
Change-Id: I5aa41a07a2d25e5c8a2d64bfa58a55fcd7aaf77e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsvalueiterator.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsvalueiterator_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp index eed8cf50b2..002a84ee08 100644 --- a/src/qml/jsapi/qjsvalueiterator.cpp +++ b/src/qml/jsapi/qjsvalueiterator.cpp @@ -142,7 +142,7 @@ bool QJSValueIterator::next() return false; d_ptr->currentName = d_ptr->nextName; d_ptr->currentIndex = d_ptr->nextIndex; - d_ptr->currentProperty.copy(d_ptr->nextProperty, d_ptr->nextAttributes); + d_ptr->currentProperty.copy(&d_ptr->nextProperty, d_ptr->nextAttributes); d_ptr->currentAttributes = d_ptr->nextAttributes; QV4::ExecutionEngine *v4 = d_ptr->iterator.engine(); diff --git a/src/qml/jsapi/qjsvalueiterator_p.h b/src/qml/jsapi/qjsvalueiterator_p.h index fe1d3aa932..c8f149c75d 100644 --- a/src/qml/jsapi/qjsvalueiterator_p.h +++ b/src/qml/jsapi/qjsvalueiterator_p.h @@ -48,10 +48,12 @@ public: QJSValue value; QV4::PersistentValue iterator; + // ### GC QV4::Property currentProperty; QV4::PropertyAttributes currentAttributes; QV4::StringValue currentName; uint currentIndex; + // ### GC QV4::Property nextProperty; QV4::PropertyAttributes nextAttributes; QV4::StringValue nextName; |