Revert "Delete JS-owned QML objects right away in the engine dtor."

This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191
to fix a crash on exit.

Task-number: QTBUG-20377

Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

2 files changed, 1 insertions, 13 deletions

diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index c67d23d..c8c35bf 100644
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -77,14 +77,7 @@ public:
 
     typedef void* Identifier;
 
-    struct Object {
-        // Like the destructor, frees resources associated with this object. The difference is that
-        // the destructor might delay resource freeing with deleteLater(), while disposeNow() always
-        // deletes the resource straigt away.
-        virtual void disposeNow() {}
-
-        virtual ~Object() {}
-    };
+    struct Object { virtual ~Object() {} };
 
     static QScriptValue newObject(QScriptEngine *, QScriptDeclarativeClass *, Object *);
     static Value newObjectValue(QScriptEngine *, QScriptDeclarativeClass *, Object *);
diff --git a/src/script/bridge/qscriptdeclarativeobject.cpp b/src/script/bridge/qscriptdeclarativeobject.cpp
index a9cd87d..927309a 100644
--- a/src/script/bridge/qscriptdeclarativeobject.cpp
+++ b/src/script/bridge/qscriptdeclarativeobject.cpp
@@ -53,11 +53,6 @@ DeclarativeObjectDelegate::DeclarativeObjectDelegate(QScriptDeclarativeClass *c,
 
 DeclarativeObjectDelegate::~DeclarativeObjectDelegate()
 {
-    // When the engine is being destructed, delete the object now, instead of using deleteLater(),
-    // to not have memory leaks on exit.
-    if (m_class->engine() && QScriptEnginePrivate::get(m_class->engine())->inDestructor)
-        m_object->disposeNow();
-
     delete m_object;
 }