Make sure that the itemview's count property is reliable

This fixes a missing countChanged signal when model
changes happen while the itemview component is not
completely initialized.

Task-number: QTBUG-37115
Change-Id: I20c749b9e521b0292186adbecd09e1d362520881
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

1 files changed, 48 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index eb0e0948..f2f39102 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -60,6 +60,8 @@ public:
     tst_QDeclarativeListView();
 
 private slots:
+    void initTestCase();
+
     // Test both QListModelInterface and QAbstractItemModel model types
     void qListModelInterface_items();
     void qAbstractItemModel_items();
@@ -116,6 +118,7 @@ private slots:
     void test_mirroring();
     void orientationChange();
     void contentPosJump();
+    void QTBUG_37115();
 
 private:
     template <class T> void items();
@@ -350,10 +353,41 @@ private:
     QList<QPair<QString,QString> > list;
 };
 
+class TestFilterModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
+    QString m_filter;
+
+public:
+    explicit TestFilterModel(QObject *parent = 0) : QSortFilterProxyModel(parent)
+    {
+        setSourceModel(new QStringListModel(QStringList() << "AA" << "BB" << "CC", this));
+    }
+
+    QString filter() const { return m_filter; }
+    void setFilter(const QString &filter)
+    {
+        if (m_filter != filter) {
+            m_filter = filter;
+            setFilterWildcard(m_filter);
+            emit filterChanged();
+        }
+    }
+
+signals:
+    void filterChanged();
+};
+
 tst_QDeclarativeListView::tst_QDeclarativeListView()
 {
 }
 
+void tst_QDeclarativeListView::initTestCase()
+{
+    qmlRegisterType<TestFilterModel>("org.test.models", 1, 0, "TestFilterModel");
+}
+
 template <class T>
 void tst_QDeclarativeListView::items()
 {
@@ -2721,6 +2755,20 @@ void tst_QDeclarativeListView::contentPosJump()
     delete canvas;
 }
 
+void tst_QDeclarativeListView::QTBUG_37115()
+{
+    QDeclarativeView *canvas = createView();
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/qtbug37115.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "listview");
+    QTRY_VERIFY(listview != 0);
+    QTRY_COMPARE(listview->property("countCopy").toInt(), 0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativeListView::qListModelInterface_items()
 {
     items<TestModel>();