Clean up objects in QQmlApplicationEngine earlier

Deleting the objects in the private class destructor leads to
crashes in V8 because the JS engine is in the middle of being
deleted. Instead, delete the objects in the public class
destructor so that it occurs before the actual engine cleanup
starts to happen.

Change-Id: I6bac813ce188be54842a78d7b532fcf2d54dc444
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index 9181dad..85aeaf5 100644 (file)
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -54,6 +54,10 @@ QQmlApplicationEnginePrivate::QQmlApplicationEnginePrivate(QQmlEngine *e)
 
 QQmlApplicationEnginePrivate::~QQmlApplicationEnginePrivate()
 {
+}
+
+void QQmlApplicationEnginePrivate::cleanUp()
+{
     qDeleteAll(objects);
 #ifndef QT_NO_TRANSLATIONS
     qDeleteAll(translators);
@@ -229,7 +233,8 @@ QQmlApplicationEngine::QQmlApplicationEngine(const QString &filePath, QObject *p
 */
 QQmlApplicationEngine::~QQmlApplicationEngine()
 {
-    //Instantiated root objects cleaned up in private class
+    Q_D(QQmlApplicationEngine);
+    d->cleanUp();//Instantiated root objects must be deleted before the engine
 }
 
 /*!

diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h
index db144af..cc38c62 100644 (file)
--- a/src/qml/qml/qqmlapplicationengine_p.h
+++ b/src/qml/qml/qqmlapplicationengine_p.h
@@ -70,6 +70,7 @@ public:
     QQmlApplicationEnginePrivate(QQmlEngine *e);
     ~QQmlApplicationEnginePrivate();
     void init();
+    void cleanUp();
 
     void startLoad(const QUrl &url, const QByteArray &data = QByteArray(), bool dataFlag = false);
     void loadTranslations(const QUrl &rootFile);