3 files changed, 4 insertions, 14 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index 2a96d96302..a10dda166c 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -66,8 +66,6 @@ void QQmlApplicationEnginePrivate::cleanUp()
 void QQmlApplicationEnginePrivate::init()
 {
     Q_Q(QQmlApplicationEngine);
-    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);
 #if QT_CONFIG(translation)
@@ -113,20 +111,15 @@ void QQmlApplicationEnginePrivate::startLoad(const QUrl &url, const QByteArray &
         c->loadUrl(url);
 
     if (!c->isLoading()) {
-        _q_finishLoad(c);
+        finishLoad(c);
         return;
     }
-    statusMapper.setMapping(c, c);
-    q->connect(c, SIGNAL(statusChanged(QQmlComponent::Status)),
-        &statusMapper, SLOT(map()));
+    QObject::connect(c, &QQmlComponent::statusChanged, q, [this, c] { this->finishLoad(c); });
 }
 
-void QQmlApplicationEnginePrivate::_q_finishLoad(QObject *o)
+void QQmlApplicationEnginePrivate::finishLoad(QQmlComponent *c)
 {
     Q_Q(QQmlApplicationEngine);
-    QQmlComponent *c = qobject_cast<QQmlComponent *>(o);
-    if (!c)
-        return;
     switch (c->status()) {
     case QQmlComponent::Error:
         qWarning() << "QQmlApplicationEngine failed to load component";
diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h
index e64d7495cd..6c57f46c72 100644
--- a/src/qml/qml/qqmlapplicationengine.h
+++ b/src/qml/qml/qqmlapplicationengine.h
@@ -74,7 +74,6 @@ Q_SIGNALS:
 private:
     Q_DISABLE_COPY(QQmlApplicationEngine)
     Q_DECLARE_PRIVATE(QQmlApplicationEngine)
-    Q_PRIVATE_SLOT(d_func(), void _q_finishLoad(QObject*))
 };
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h
index 8c342a43a9..4795170bed 100644
--- a/src/qml/qml/qqmlapplicationengine_p.h
+++ b/src/qml/qml/qqmlapplicationengine_p.h
@@ -42,7 +42,6 @@
 
 #include "qqmlapplicationengine.h"
 #include "qqmlengine_p.h"
-#include <QSignalMapper>
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QLibraryInfo>
@@ -73,9 +72,8 @@ public:
 
     void startLoad(const QUrl &url, const QByteArray &data = QByteArray(), bool dataFlag = false);
     void loadTranslations(const QUrl &rootFile);
-    void _q_finishLoad(QObject *component);
+    void finishLoad(QQmlComponent *component);
     QList<QObject *> objects;
-    QSignalMapper statusMapper;
     QObject *appObj;
 
 #if QT_CONFIG(translation)