From af41170bc5e4c1be194bb9bbe883b00c2f7062b7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sat, 15 Mar 2014 10:03:02 +0100 Subject: Fix crash on shutdown with states When populating deferred properties, we must not set the rootObjectInCreation flags on the root context and (consequently) on any sub-objects objects created when initializing deferred properties. Doing so otherwise will end up us incorrectly linking QQmlContextData together, causing QQmlData::linkedContext to point to iself and crash on exit upon deletion. Task-number: QTBUG-37484 Change-Id: Ia5dc92a04e0f66499f15fbac10f14859d387b021 Reviewed-by: Lars Knoll --- tests/auto/qml/qqmllanguage/testtypes.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/qml/qqmllanguage/testtypes.cpp') diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index fad5c1e65d..c37845840b 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -92,6 +92,8 @@ void registerTypes() qmlRegisterType("Test", 1, 1, "MyCreateableDerivedClass"); qmlRegisterCustomType("Test", 1, 0, "CustomBinding", new CustomBindingParser); + + qmlRegisterType("Test", 1, 0, "RootObjectInCreationTester"); } QVariant myCustomVariantTypeConverter(const QString &data) -- cgit v1.2.3