3 files changed, 34 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp
index bd59409475..14892bd6ad 100644
--- a/src/qml/qml/qqmlcontext.cpp
+++ b/src/qml/qml/qqmlcontext.cpp
@@ -317,6 +317,12 @@ void QQmlContext::setContextProperty(const QString &name, const QVariant &value)
         d->propertyValues[idx] = value;
         QMetaObject::activate(this, d->notifyIndex, idx, nullptr);
     }
+
+    if (auto *obj = qvariant_cast<QObject *>(value)) {
+        connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed) {
+            d->dropDestroyedQObject(name, destroyed);
+        });
+    }
 }
 
 /*!
@@ -524,6 +530,17 @@ QObject *QQmlContextPrivate::context_at(QQmlListProperty<QObject> *prop, int ind
     }
 }
 
+void QQmlContextPrivate::dropDestroyedQObject(const QString &name, QObject *destroyed)
+{
+    const int idx = data->propertyNames().value(name);
+    Q_ASSERT(idx >= 0);
+    if (qvariant_cast<QObject *>(propertyValues[idx]) != destroyed)
+        return;
+
+    propertyValues[idx] = QVariant::fromValue<QObject *>(nullptr);
+    QMetaObject::activate(q_func(), notifyIndex, idx, nullptr);
+}
+
 
 QQmlContextData::QQmlContextData()
     : QQmlContextData(nullptr)
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 1ddd04c9ff..5f7316b00c 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -104,6 +104,8 @@ public:
 
     static int context_count(QQmlListProperty<QObject> *);
     static QObject *context_at(QQmlListProperty<QObject> *, int);
+
+    void dropDestroyedQObject(const QString &name, QObject *destroyed);
 };
 
 class QQmlComponentAttached;
diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index cb4bee0d3a..d9cb6673df 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -71,6 +71,7 @@ private slots:
 
     void outerContextObject();
     void contextObjectHierarchy();
+    void destroyContextProperty();
 
 private:
     QQmlEngine engine;
@@ -892,6 +893,20 @@ void tst_qqmlcontext::contextObjectHierarchy()
     });
 }
 
+void tst_qqmlcontext::destroyContextProperty()
+{
+    QQmlEngine engine;
+    QQmlContext context(&engine);
+
+    {
+        QObject object;
+        context.setContextProperty(QLatin1String("a"), &object);
+        QCOMPARE(qvariant_cast<QObject *>(context.contextProperty(QLatin1String("a"))), &object);
+    }
+
+    QCOMPARE(qvariant_cast<QObject *>(context.contextProperty(QLatin1String("a"))), nullptr);
+}
+
 QTEST_MAIN(tst_qqmlcontext)
 
 #include "tst_qqmlcontext.moc"