1 files changed, 4 insertions, 10 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index 57cdd3f47f..fef2da753b 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -69,6 +69,7 @@ void QQmlApplicationEnginePrivate::init()
     q->connect(&statusMapper, SIGNAL(mapped(QObject*)),
             q, SLOT(_q_finishLoad(QObject*)));
     q->connect(q, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+    q->connect(q, &QQmlApplicationEngine::exit, QCoreApplication::instance(), &QCoreApplication::exit);
 #ifndef QT_NO_TRANSLATION
     QTranslator* qtTranslator = new QTranslator;
     if (qtTranslator->load(QLatin1String("qt_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
@@ -134,7 +135,7 @@ void QQmlApplicationEnginePrivate::_q_finishLoad(QObject *o)
         break;
     case QQmlComponent::Ready:
         objects << c->create();
-        q->objectCreated(objects.last(), c->url());
+        q->objectCreated(objects.constLast(), c->url());
         break;
     case QQmlComponent::Loading:
     case QQmlComponent::Null:
@@ -211,11 +212,8 @@ QQmlApplicationEngine::QQmlApplicationEngine(QObject *parent)
   This is provided as a convenience,  and is the same as using the empty constructor and calling load afterwards.
 */
 QQmlApplicationEngine::QQmlApplicationEngine(const QUrl &url, QObject *parent)
-    : QQmlEngine(*(new QQmlApplicationEnginePrivate(this)), parent)
+    : QQmlApplicationEngine(parent)
 {
-    Q_D(QQmlApplicationEngine);
-    d->init();
-    QJSEnginePrivate::addToDebugServer(this);
     load(url);
 }
 
@@ -228,12 +226,8 @@ QQmlApplicationEngine::QQmlApplicationEngine(const QUrl &url, QObject *parent)
   This is provided as a convenience, and is the same as using the empty constructor and calling load afterwards.
 */
 QQmlApplicationEngine::QQmlApplicationEngine(const QString &filePath, QObject *parent)
-    : QQmlEngine(*(new QQmlApplicationEnginePrivate(this)), parent)
+    : QQmlApplicationEngine(QUrl::fromLocalFile(filePath), parent)
 {
-    Q_D(QQmlApplicationEngine);
-    d->init();
-    QJSEnginePrivate::addToDebugServer(this);
-    load(QUrl::fromLocalFile(filePath));
 }
 
 /*!