From 6cf397f7ac35a058096528a7ad8bfaf623b30747 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Tue, 16 Nov 2010 15:59:56 +1000
Subject: VisualDataModel::count should be 0 until a valid delegate is set.

There are no visual items if there is no delegate.

Task-number: QTBUG-14781
Reviewed-by: Robert Griebl
---
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  |  2 ++
 .../tst_qdeclarativevisualdatamodel.cpp            | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 1f01a45..9601db0 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -937,6 +937,8 @@ void QDeclarativeVisualDataModel::setPart(const QString &part)
 int QDeclarativeVisualDataModel::count() const
 {
     Q_D(const QDeclarativeVisualDataModel);
+    if (!d->m_delegate)
+        return 0;
     return d->modelCount();
 }
 
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index 0aad099..29a065c 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -121,6 +121,7 @@ private slots:
     void objectListModel();
     void singleRole();
     void modelProperties();
+    void noDelegate();
 
 private:
     QDeclarativeEngine engine;
@@ -472,6 +473,29 @@ void tst_qdeclarativevisualdatamodel::modelProperties()
     //### should also test QStringList and QVariantList
 }
 
+void tst_qdeclarativevisualdatamodel::noDelegate()
+{
+    QDeclarativeView view;
+
+    QStandardItemModel model;
+    initStandardTreeModel(&model);
+
+    view.rootContext()->setContextProperty("myModel", &model);
+
+    view.setSource(QUrl::fromLocalFile(SRCDIR "/data/datalist.qml"));
+
+    QDeclarativeListView *listview = qobject_cast<QDeclarativeListView*>(view.rootObject());
+    QVERIFY(listview != 0);
+
+    QDeclarativeVisualDataModel *vdm = listview->findChild<QDeclarativeVisualDataModel*>("visualModel");
+    QVERIFY(vdm != 0);
+    QCOMPARE(vdm->count(), 3);
+
+    vdm->setDelegate(0);
+    QCOMPARE(vdm->count(), 0);
+}
+
+
 template<typename T>
 T *tst_qdeclarativevisualdatamodel::findItem(QGraphicsObject *parent, const QString &objectName, int index)
 {
-- 
cgit v0.12