1 files changed, 25 insertions, 22 deletions

diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 0168d73c8f..30fd98a63c 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -50,6 +50,7 @@ QQuickRepeaterPrivate::QQuickRepeaterPrivate()
     , delegateValidated(false)
     , itemCount(0)
 {
+    setTransparentForPositioner(true);
 }
 
 QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
@@ -199,11 +200,12 @@ void QQuickRepeater::setModel(const QVariant &m)
 
     clear();
     if (d->model) {
-        disconnect(d->model, SIGNAL(modelUpdated(QQmlChangeSet,bool)),
-                this, SLOT(modelUpdated(QQmlChangeSet,bool)));
-        disconnect(d->model, SIGNAL(createdItem(int,QObject*)), this, SLOT(createdItem(int,QObject*)));
-        disconnect(d->model, SIGNAL(initItem(int,QObject*)), this, SLOT(initItem(int,QObject*)));
-//        disconnect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*)));
+        qmlobject_disconnect(d->model, QQmlInstanceModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)),
+                this, QQuickRepeater, SLOT(modelUpdated(QQmlChangeSet,bool)));
+        qmlobject_disconnect(d->model, QQmlInstanceModel, SIGNAL(createdItem(int,QObject*)),
+                this, QQuickRepeater, SLOT(createdItem(int,QObject*)));
+        qmlobject_disconnect(d->model, QQmlInstanceModel, SIGNAL(initItem(int,QObject*)),
+                this, QQuickRepeater, SLOT(initItem(int,QObject*)));
     }
     d->dataSource = model;
     QObject *object = qvariant_cast<QObject*>(model);
@@ -227,11 +229,12 @@ void QQuickRepeater::setModel(const QVariant &m)
             dataModel->setModel(model);
     }
     if (d->model) {
-        connect(d->model, SIGNAL(modelUpdated(QQmlChangeSet,bool)),
-                this, SLOT(modelUpdated(QQmlChangeSet,bool)));
-        connect(d->model, SIGNAL(createdItem(int,QObject*)), this, SLOT(createdItem(int,QObject*)));
-        connect(d->model, SIGNAL(initItem(int,QObject*)), this, SLOT(initItem(int,QObject*)));
-//        connect(d->model, SIGNAL(destroyingItem(QObject*)), this, SLOT(destroyingItem(QObject*)));
+        qmlobject_connect(d->model, QQmlInstanceModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)),
+                this, QQuickRepeater, SLOT(modelUpdated(QQmlChangeSet,bool)));
+        qmlobject_connect(d->model, QQmlInstanceModel, SIGNAL(createdItem(int,QObject*)),
+                this, QQuickRepeater, SLOT(createdItem(int,QObject*)));
+        qmlobject_connect(d->model, QQmlInstanceModel, SIGNAL(initItem(int,QObject*)),
+                this, QQuickRepeater, SLOT(initItem(int,QObject*)));
         regenerate();
     }
     emit modelChanged();
@@ -360,8 +363,8 @@ void QQuickRepeater::clear()
             if (QQuickItem *item = d->deletables.at(i)) {
                 if (complete)
                     emit itemRemoved(i, item);
-                item->setParentItem(0);
                 d->model->release(item);
+                item->setParentItem(0);
             }
         }
     }
@@ -397,9 +400,17 @@ void QQuickRepeaterPrivate::requestItems()
 void QQuickRepeater::createdItem(int index, QObject *)
 {
     Q_D(QQuickRepeater);
+    QObject *object = d->model->object(index, false);
+    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
+    emit itemAdded(index, item);
+}
+
+void QQuickRepeater::initItem(int index, QObject *object)
+{
+    Q_D(QQuickRepeater);
+    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
+
     if (!d->deletables.at(index)) {
-        QObject *object = d->model->object(index, false);
-        QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
         if (!item) {
             if (object) {
                 d->model->release(object);
@@ -425,17 +436,9 @@ void QQuickRepeater::createdItem(int index, QObject *)
             }
             item->stackBefore(after);
         }
-        emit itemAdded(index, item);
     }
 }
 
-void QQuickRepeater::initItem(int, QObject *object)
-{
-    QQuickItem *item = qmlobject_cast<QQuickItem*>(object);
-    if (item)
-        item->setParentItem(parentItem());
-}
-
 void QQuickRepeater::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
 {
     Q_D(QQuickRepeater);
@@ -465,8 +468,8 @@ void QQuickRepeater::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
             d->deletables.remove(index);
             emit itemRemoved(index, item);
             if (item) {
-                item->setParentItem(0);
                 d->model->release(item);
+                item->setParentItem(0);
             }
             --d->itemCount;
         }