diff options
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 12 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject_p.h | 3 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 3 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 26cfe10f21..a34faeed1a 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -1017,14 +1017,14 @@ QJsonObject JsonObject::toJsonObject(Object *o, V4ObjectSet &visitedObjects) Scope scope(o->engine()); - if (visitedObjects.contains(o)) { + if (visitedObjects.contains(o->d())) { // Avoid recursion. // For compatibility with QVariant{List,Map} conversion, we return an // empty object (and no error is thrown). return result; } - visitedObjects.insert(o); + visitedObjects.insert(o->d()); ObjectIterator it(scope, o, ObjectIterator::EnumerableOnly); ScopedValue name(scope); @@ -1039,7 +1039,7 @@ QJsonObject JsonObject::toJsonObject(Object *o, V4ObjectSet &visitedObjects) result.insert(key, toJsonValue(val, visitedObjects)); } - visitedObjects.remove(o); + visitedObjects.remove(o->d()); return result; } @@ -1065,14 +1065,14 @@ QJsonArray JsonObject::toJsonArray(ArrayObject *a, V4ObjectSet &visitedObjects) Scope scope(a->engine()); - if (visitedObjects.contains(a)) { + if (visitedObjects.contains(a->d())) { // Avoid recursion. // For compatibility with QVariant{List,Map} conversion, we return an // empty array (and no error is thrown). return result; } - visitedObjects.insert(a); + visitedObjects.insert(a->d()); ScopedValue v(scope); quint32 length = a->getLength(); @@ -1083,7 +1083,7 @@ QJsonArray JsonObject::toJsonArray(ArrayObject *a, V4ObjectSet &visitedObjects) result.append(toJsonValue(v, visitedObjects)); } - visitedObjects.remove(a); + visitedObjects.remove(a->d()); return result; } diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h index 4004a06dec..32d890c488 100644 --- a/src/qml/jsruntime/qv4jsonobject_p.h +++ b/src/qml/jsruntime/qv4jsonobject_p.h @@ -54,7 +54,8 @@ struct JsonObject : Object { Q_MANAGED_TYPE(JsonObject) V4_OBJECT2(JsonObject, Object) private: - typedef QSet<QV4::Object *> V4ObjectSet; + // ### GC + typedef QSet<QV4::Heap::Base *> V4ObjectSet; public: static ReturnedValue method_parse(CallContext *ctx); diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index ed0f50f16c..5e9e20b416 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -259,7 +259,7 @@ QVariant QV8Engine::objectToVariant(QV4::Object *o, V8ObjectSet *visitedObjects) V8ObjectSet recursionGuardSet; if (!visitedObjects) { visitedObjects = &recursionGuardSet; - } else if (visitedObjects->contains(o)) { + } else if (visitedObjects->contains(o->d())) { // Avoid recursion. // For compatibility with QVariant{List,Map} conversion, we return an // empty object (and no error is thrown). @@ -267,7 +267,7 @@ QVariant QV8Engine::objectToVariant(QV4::Object *o, V8ObjectSet *visitedObjects) return QVariantList(); return QVariantMap(); } - visitedObjects->insert(o); + visitedObjects->insert(o->d()); QVariant result; @@ -302,7 +302,7 @@ QVariant QV8Engine::objectToVariant(QV4::Object *o, V8ObjectSet *visitedObjects) result = map; } - visitedObjects->remove(o); + visitedObjects->remove(o->d()); return result; } diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 2379689fb3..4a6737a131 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -165,7 +165,8 @@ class QQmlContextData; class Q_QML_PRIVATE_EXPORT QV8Engine { friend class QJSEngine; - typedef QSet<QV4::Object *> V8ObjectSet; + // ### GC + typedef QSet<QV4::Heap::Object *> V8ObjectSet; public: static QV8Engine* get(QJSEngine* q) { Q_ASSERT(q); return q->handle(); } // static QJSEngine* get(QV8Engine* d) { Q_ASSERT(d); return d->q; } |