From 19e14d8e2aceb449d3788313165bd371be714a24 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 23 Aug 2012 14:20:47 +1000 Subject: Fix assert when a VisualDataModels context has been invalidated. Verify the context is valid before attempting to access its engine. The context should normally be valid but there is a small window between a delegate item being released and the DeferredDelete event being processed when it is not. Task-number: QTBUG-26949 Change-Id: I79f3affaed8904cbe0974476010b68305666cd29 Reviewed-by: Bea Lam --- .../tst_qquickvisualdatamodel.cpp | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index e55c537529..fce746b361 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -437,6 +437,7 @@ private slots: void asynchronousMove(); void asynchronousMove_data(); void asynchronousCancel(); + void invalidContext(); private: template void groups_verify( @@ -4206,6 +4207,35 @@ void tst_qquickvisualdatamodel::asynchronousCancel() QCOMPARE(controller.incubatingObjectCount(), 0); } +void tst_qquickvisualdatamodel::invalidContext() +{ + QQmlEngine engine; + QaimModel model; + for (int i = 0; i < 8; i++) + model.addItem("Original item" + QString::number(i), ""); + + engine.rootContext()->setContextProperty("myModel", &model); + + QScopedPointer context(new QQmlContext(engine.rootContext())); + + QQmlComponent c(&engine, testFileUrl("visualdatamodel.qml")); + + + QQuickVisualDataModel *visualModel = qobject_cast(c.create(context.data())); + QVERIFY(visualModel); + + QQuickItem *item = visualModel->item(4, false); + QVERIFY(item); + visualModel->release(item); + + delete context.take(); + + model.insertItem(4, "new item", ""); + + item = visualModel->item(4, false); + QVERIFY(!item); +} + QTEST_MAIN(tst_qquickvisualdatamodel) #include "tst_qquickvisualdatamodel.moc" -- cgit v1.2.3