diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-02 16:16:09 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-02 20:25:49 +0000 |
| commit | 0d63c22eee293fe59d7691608deaaf3468045eb3 (patch) | |
| tree | e54d53a183d91efc8e4e7089d4bbc5964f4badce /src/qml/jsruntime | |
| parent | 0754f55287f4652382332bce42cd8c7d27846ef1 (diff) | |
Remove support for iterating over the proto chain from ObjectIterator
This will simplify moving over to the new iteration model. It implies
a very small behavioral change in a few places where we used to
iterate over the proto chain before.
Change-Id: Ia62c9c51712d6b45e69ca63becdbefab6fa4bf3f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 5 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator_p.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index d4e07e3d77..a6af3ecf9b 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -104,10 +104,7 @@ void ObjectIterator::next(Value *name, uint *index, Property *pd, PropertyAttrib return; } - if (flags & WithProtoChain) - current->setM(co->getPrototypeOf()); - else - current->setM(nullptr); + current->setM(nullptr); arrayIndex = 0; memberIndex = 0; diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index 20eb918e12..ca40748b79 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -61,8 +61,7 @@ struct Q_QML_EXPORT ObjectIteratorData { enum Flags { NoFlags = 0, - EnumerableOnly = 0x1, - WithProtoChain = 0x2, + EnumerableOnly = 0x1 }; ExecutionEngine *engine; |