From 9c4621217f47b8427e284423d4e5c5e4dba00bfc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 23 Dec 2015 18:26:50 +0100 Subject: Revert "Fix QtSharedPointer::ExternalRefCountData object leaks" This reverts commit 839d2d3e2368bc8e107d22203b0611c852f54319, which has been causing crashes in qtquickcontrols2 auto tests and making it nearly impossible to integrate anything over the past few days. Change-Id: I570b286a067aae5e3c2d8c56ad601e1a6cb58c20 Task-number: QTBUG-50134 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4persistent.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/qml/jsruntime/qv4persistent.cpp') diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp index 032ad0d00a..4a0f84b685 100644 --- a/src/qml/jsruntime/qv4persistent.cpp +++ b/src/qml/jsruntime/qv4persistent.cpp @@ -34,7 +34,6 @@ #include "qv4persistent_p.h" #include #include "qv4object_p.h" -#include "qv4qobjectwrapper_p.h" #include "PageAllocation.h" using namespace QV4; @@ -205,12 +204,6 @@ void PersistentValueStorage::free(Value *v) Page *p = getPage(v); - // Keep track of QObjectWrapper to release its resources later in MemoryManager::sweep() - if (p->header.engine) { - if (QObjectWrapper *qobjectWrapper = v->as()) - p->header.engine->memoryManager->m_pendingDestroyedObjectWrappers.push_back(qobjectWrapper->d()); - } - v->setTag(QV4::Value::Empty_Type); v->setInt_32(p->header.freeList); p->header.freeList = v - p->values; -- cgit v1.2.3