diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-23 18:26:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-23 18:19:57 +0000 |
| commit | 9c4621217f47b8427e284423d4e5c5e4dba00bfc (patch) | |
| tree | 50c2cc2fddfdb1c6c5432fa1a8aeae3251a0d7e3 /src/qml/jsruntime | |
| parent | 7842c2c19c16e6d52d1b138fb33ee563bae0faae (diff) | |
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>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4persistent.cpp | 7 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 5 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper_p.h | 1 |
3 files changed, 0 insertions, 13 deletions
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 <private/qv4mm_p.h> #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<QObjectWrapper>()) - 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; diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 2cb8991055..8f471132b7 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1019,11 +1019,6 @@ void QObjectWrapper::markObjects(Heap::Base *that, QV4::ExecutionEngine *e) void QObjectWrapper::destroyObject(bool lastCall) { Heap::QObjectWrapper *h = d(); - destroyObject(h, lastCall); -} - -void QObjectWrapper::destroyObject(Heap::QObjectWrapper *h, bool lastCall) -{ if (!h->internalClass) return; // destroyObject already got called diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h index 29e1263f2d..1126013806 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper_p.h +++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h @@ -120,7 +120,6 @@ struct Q_QML_EXPORT QObjectWrapper : public Object void setProperty(ExecutionEngine *engine, int propertyIndex, const Value &value); void destroyObject(bool lastCall); - static void destroyObject(Heap::QObjectWrapper *h, bool lastCall); protected: static bool isEqualTo(Managed *that, Managed *o); |