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 <simon.hausmann@theqtcompany.com>

1 files changed, 2 insertions, 9 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())