From 0ecadd9530626e981fa994cee1d505d32249f503 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 20 Mar 2012 11:58:09 +1000 Subject: Loader could leak qml contexts if interrupted If Loader was either destroyed, or its source changed while it was incubating the itemContext could be leaked. Change-Id: I5b749062552954d92bf2851250f942b20ebbfe68 Reviewed-by: Andrew den Exter --- tests/auto/quick/qquickloader/tst_qquickloader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/auto/quick/qquickloader') diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp index bdf47fa9e9..01781f7b54 100644 --- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp @@ -929,7 +929,7 @@ void tst_QQuickLoader::asynchronous_clear() QVERIFY(!loader->item()); QCOMPARE(loader->status(), QQuickLoader::Loading); - QCOMPARE(engine.incubationController()->incubatingObjectCount(), 1); + QTRY_COMPARE(engine.incubationController()->incubatingObjectCount(), 1); // clear before component created root->setProperty("comp", ""); @@ -942,7 +942,7 @@ void tst_QQuickLoader::asynchronous_clear() QCOMPARE(static_cast(loader)->childItems().count(), 0); // check loading component - root->setProperty("comp", "Rect120x60.qml"); + root->setProperty("comp", "BigComponent.qml"); QMetaObject::invokeMethod(root, "loadComponent"); QVERIFY(!loader->item()); @@ -953,6 +953,8 @@ void tst_QQuickLoader::asynchronous_clear() QCOMPARE(loader->progress(), 1.0); QCOMPARE(loader->status(), QQuickLoader::Ready); QCOMPARE(static_cast(loader)->childItems().count(), 1); + + delete root; } void tst_QQuickLoader::simultaneousSyncAsync() -- cgit v1.2.3