1 files changed, 12 insertions, 9 deletions
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 57f1b99456..297f64176c 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -41,8 +41,8 @@
 
 #include "qquicklistview_p.h"
 #include "qquickitemview_p_p.h"
-#include "qquickvisualitemmodel_p.h"
 
+#include <private/qqmlobjectmodel_p.h>
 #include <QtQml/qqmlexpression.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlinfo.h>
@@ -106,7 +106,7 @@ public:
     virtual void setPosition(qreal pos);
     virtual void layoutVisibleItems(int fromModelIndex = 0);
 
-    virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
+    virtual bool applyInsertionChange(const QQmlChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
     virtual void translateAndTransitionItemsAfter(int afterIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult);
 
     virtual void updateSectionCriteria();
@@ -2803,13 +2803,16 @@ void QQuickListView::geometryChanged(const QRectF &newGeometry, const QRectF &ol
     QQuickItemView::geometryChanged(newGeometry, oldGeometry);
 }
 
-void QQuickListView::initItem(int index, QQuickItem *item)
+void QQuickListView::initItem(int index, QObject *object)
 {
-    QQuickItemView::initItem(index, item);
-    QQuickListViewAttached *attached = static_cast<QQuickListViewAttached *>(
-            qmlAttachedPropertiesObject<QQuickListView>(item));
-    if (attached)
-        attached->setView(this);
+    QQuickItemView::initItem(index, object);
+    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
+    if (item) {
+        QQuickListViewAttached *attached = static_cast<QQuickListViewAttached *>(
+                qmlAttachedPropertiesObject<QQuickListView>(item));
+        if (attached)
+            attached->setView(this);
+    }
 }
 
 
@@ -2867,7 +2870,7 @@ void QQuickListViewPrivate::updateSectionCriteria()
     }
 }
 
-bool QQuickListViewPrivate::applyInsertionChange(const QQuickChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
+bool QQuickListViewPrivate::applyInsertionChange(const QQmlChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
 {
     int modelIndex = change.index;
     int count = change.count;