Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219

1 files changed, 7 insertions, 0 deletions

diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp
index a3ca48d6d9..cfbe0c409e 100644
--- a/src/qml/qml/qqml.cpp
+++ b/src/qml/qml/qqml.cpp
@@ -79,6 +79,13 @@ int qmlTypeId(const char *uri, int versionMajor, int versionMinor, const char *q
 // From qqmlprivate.h
 QObject *QQmlPrivate::RegisterSingletonFunctor::operator()(QQmlEngine *qeng, QJSEngine *)
 {
+    if (!m_object) {
+        QQmlError error;
+        error.setDescription(QLatin1String("The registered singleton has already been deleted. Ensure that it outlives the engine."));
+        QQmlEnginePrivate::get(qeng)->warning(qeng, error);
+        return nullptr;
+    }
+
     if (qeng->thread() != m_object->thread()) {
         QQmlError error;
         error.setDescription(QLatin1String("Registered object must live in the same thread as the engine it was registered with"));