aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/memory
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/memory')
-rw-r--r--src/qml/memory/qv4mm.cpp11
-rw-r--r--src/qml/memory/qv4mm_p.h2
2 files changed, 2 insertions, 11 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
index 053dfb856c..5181bf912b 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -41,6 +41,8 @@
#include "StdLibExtras.h"
#include <QTime>
+#include <QVector>
+#include <QVector>
#include <QMap>
#include <iostream>
@@ -435,15 +437,6 @@ void MemoryManager::sweep(bool lastSweep)
(*it) = Primitive::undefinedValue();
}
- // Some QV4::QObjectWrapper objects will be removed from PersistentValueStorage in WeakValue::~WeakValue()
- // before MemoryManager::sweep() is being called, in this case we will never have a chance to call detroyObject()
- // on those QV4::QObjectWrapper objects. Here we call detroyObject() for each pending destroyed Heap::QObjectWrapper
- // object on the heap to make sure that we can release all the resources held by them
- for (QVector<Heap::QObjectWrapper *>::const_iterator it = m_pendingDestroyedObjectWrappers.constBegin();
- it != m_pendingDestroyedObjectWrappers.constEnd(); ++it)
- QObjectWrapper::destroyObject(*it, lastSweep);
- m_pendingDestroyedObjectWrappers.clear();
-
if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) {
for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) {
if (!it.value().isNullOrUndefined())
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
index 69aae1c5bf..3543da0907 100644
--- a/src/qml/memory/qv4mm_p.h
+++ b/src/qml/memory/qv4mm_p.h
@@ -49,7 +49,6 @@
#include <private/qv4value_p.h>
#include <private/qv4scopedvalue_p.h>
#include <private/qv4object_p.h>
-#include <QVector>
//#define DETAILED_MM_STATS
@@ -328,7 +327,6 @@ public:
QScopedPointer<Data> m_d;
PersistentValueStorage *m_persistentValues;
PersistentValueStorage *m_weakValues;
- QVector<Heap::QObjectWrapper *> m_pendingDestroyedObjectWrappers;
};
}