Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	src/qml/compiler/qv4compileddata.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4qmlcontext.cpp
	src/qml/jsruntime/qv4qmlcontext_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	src/qml/jsruntime/qv4regexpobject_p.h
	src/qml/types/qqmllistmodel.cpp
	src/quick/items/qquickanimatedimage_p.h
	src/quick/scenegraph/qsgrenderloop.cpp
	tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp

Change-Id: If20ef62b2c98bdf656cb2f5d27b1897b754d3dc0

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index f49fd391ac..5f57b9ebb0 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -62,6 +62,7 @@ private slots:
     void evalAfterInvalidate();
     void qobjectDerived();
     void qtbug_49232();
+    void contextViaClosureAfterDestruction();
 
 private:
     QQmlEngine engine;
@@ -723,6 +724,33 @@ void tst_qqmlcontext::qtbug_49232()
     QCOMPARE(obj->property("valueTwo"), QVariant(97));
 }
 
+void tst_qqmlcontext::contextViaClosureAfterDestruction()
+{
+    qmlRegisterSingletonType(testFileUrl("Singleton.qml"), "constants", 1, 0, "Sing");
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("contextViaClosureAfterDestruction.qml"));
+    QJSValue valueClosure;
+    QJSValue componentFactoryClosure;
+    {
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(!obj.isNull());
+        // meta-calls don't support QJSValue return types, so do the call "by hand"
+        valueClosure = engine.newQObject(obj.data()).property(QStringLiteral("createClosure")).call();
+        QVERIFY(valueClosure.isCallable());
+        componentFactoryClosure = engine.newQObject(obj.data()).property(QStringLiteral("createComponentFactory")).call();
+        QVERIFY(componentFactoryClosure.isCallable());
+    }
+    QCOMPARE(valueClosure.call().toString(), QLatin1String("Highway to Hell"));
+
+    QScopedPointer<QObject> parent(new QObject);
+    QJSValue parentWrapper = engine.newQObject(parent.data());
+    QQmlEngine::setObjectOwnership(parent.data(), QQmlEngine::CppOwnership);
+
+    QJSValue subObject = componentFactoryClosure.callWithInstance(componentFactoryClosure, QJSValueList() << parentWrapper);
+    QVERIFY(subObject.isError());
+    QCOMPARE(subObject.toString(), QLatin1String("Error: Qt.createQmlObject(): Cannot create a component in an invalid context"));
+}
+
 QTEST_MAIN(tst_qqmlcontext)
 
 #include "tst_qqmlcontext.moc"