Don't construct VisualDataModel attached properties unless requested.

This saves allocating a QObject per item model in the common case.

Change-Id: I0e77e6c6c0c64ac6c5e482ef55e194c68e778b32
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index b8d46ac373..9047dcc021 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -229,6 +229,7 @@ private slots:
     void resolve();
     void warnings_data();
     void warnings();
+    void invalidAttachment();
 
 private:
     template <int N> void groups_verify(
@@ -3439,6 +3440,31 @@ void tst_qquickvisualdatamodel::warnings()
     QCOMPARE(evaluate<int>(listView, "count"), count);
 }
 
+void tst_qquickvisualdatamodel::invalidAttachment()
+{
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("invalidAttachment.qml"));
+
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(object);
+    QCOMPARE(component.errors().count(), 0);
+
+    QVariant property = object->property("invalidVdm");
+    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
+    QVERIFY(!property.value<QQuickVisualDataModel *>());
+
+    QQuickItem *item = object->findChild<QQuickItem *>("delegate");
+    QVERIFY(item);
+
+    property = item->property("validVdm");
+    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
+    QVERIFY(property.value<QQuickVisualDataModel *>());
+
+    property = item->property("invalidVdm");
+    QCOMPARE(property.userType(), qMetaTypeId<QQuickVisualDataModel *>());
+    QVERIFY(!property.value<QQuickVisualDataModel *>());
+}
+
 
 QTEST_MAIN(tst_qquickvisualdatamodel)