diff options
author | Jian Liang <jianliang79@gmail.com> | 2015-12-25 21:36:46 +0800 |
---|---|---|
committer | jian liang <jianliang79@gmail.com> | 2016-01-22 14:07:19 +0000 |
commit | 3cc589c98390992e3ee8a7970dc2913ea857d623 (patch) | |
tree | 6c058e0bcd2c31661d370e7baed66d4cffaae32a /src/qml/memory/qv4mm_p.h | |
parent | 2d7921184e86c9dcd4189bd7da79b3fa050abedc (diff) |
Make sure we destroy all QV4::QObjectWrapper objects
Delay freeing QObjectWrapper Value to MemoryManager::sweep() to make sure
we can destroy all QObjectWrapper objects.
We also keep track of QObjectWrapper in QV4::Heap::ModelObject to make
sure we destory them in QV4::MemoryManager::sweep()
Change-Id: I3a8a3b07faab1f88c2eb746f68aa8d9584b40026
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/memory/qv4mm_p.h')
-rw-r--r-- | src/qml/memory/qv4mm_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h index 3543da0907..e19cf301ea 100644 --- a/src/qml/memory/qv4mm_p.h +++ b/src/qml/memory/qv4mm_p.h @@ -49,6 +49,7 @@ #include <private/qv4value_p.h> #include <private/qv4scopedvalue_p.h> #include <private/qv4object_p.h> +#include <QVector> //#define DETAILED_MM_STATS @@ -327,6 +328,7 @@ public: QScopedPointer<Data> m_d; PersistentValueStorage *m_persistentValues; PersistentValueStorage *m_weakValues; + QVector<Value *> m_pendingFreedObjectWrapperValue; }; } |