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/types | |
| 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/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index d9adb7808e..bf2fe3b52a 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -1746,7 +1746,7 @@ bool QQmlDelegateModelPrivate::insert(Compositor::insert_iterator &before, const if (!o) return false; - QV4::ObjectIterator it(scope, o, QV4::ObjectIterator::EnumerableOnly|QV4::ObjectIterator::WithProtoChain); + QV4::ObjectIterator it(scope, o, QV4::ObjectIterator::EnumerableOnly); QV4::ScopedValue propertyName(scope); QV4::ScopedValue v(scope); while (1) { diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index c6597b49f3..30e5b83d5c 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -563,7 +563,7 @@ void ListModel::set(int elementIndex, QV4::Object *object, QVector<int> *roles) QV4::Scope scope(v4); QV4::ScopedObject o(scope); - QV4::ObjectIterator it(scope, object, QV4::ObjectIterator::WithProtoChain|QV4::ObjectIterator::EnumerableOnly); + QV4::ObjectIterator it(scope, object, QV4::ObjectIterator::EnumerableOnly); QV4::ScopedString propertyName(scope); QV4::ScopedValue propertyValue(scope); while (1) { @@ -642,7 +642,7 @@ void ListModel::set(int elementIndex, QV4::Object *object) QV4::ExecutionEngine *v4 = object->engine(); QV4::Scope scope(v4); - QV4::ObjectIterator it(scope, object, QV4::ObjectIterator::WithProtoChain|QV4::ObjectIterator::EnumerableOnly); + QV4::ObjectIterator it(scope, object, QV4::ObjectIterator::EnumerableOnly); QV4::ScopedString propertyName(scope); QV4::ScopedValue propertyValue(scope); QV4::ScopedObject o(scope); |