QQuickTableView: set delegate parent early-on

Set the parent before bindings are evaluated.

Change-Id: I370524fe32c66699bd73aafeac55c58667b4dff1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 13 insertions, 5 deletions

diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index db1d262df7..7b2070ff52 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -333,7 +333,13 @@ FxTableItem *QQuickTableViewPrivate::createFxTableItem(const QPoint &cell, QQmlI
         ownItem = true;
     }
 
-    item->setParentItem(q->contentItem());
+    if (ownItem) {
+        // Parent item is normally set early on from initItemCallback (to
+        // allow bindings to the parent property). But if we created the item
+        // within this function, we need to set it explicit.
+        item->setParentItem(q->contentItem());
+    }
+    Q_TABLEVIEW_ASSERT(item->parentItem() == q->contentItem(), item->parentItem());
 
     FxTableItem *fxTableItem = new FxTableItem(item, q, ownItem);
     fxTableItem->setVisible(false);
@@ -1088,11 +1094,13 @@ void QQuickTableViewPrivate::itemCreatedCallback(int modelIndex, QObject*)
 void QQuickTableViewPrivate::initItemCallback(int modelIndex, QObject *object)
 {
     Q_UNUSED(modelIndex);
-    auto attached = getAttachedObject(object);
-    if (!attached)
-        return;
+    Q_Q(QQuickTableView);
+
+    if (auto item = qmlobject_cast<QQuickItem*>(object))
+        item->setParentItem(q->contentItem());
 
-    attached->setTableView(q_func());
+    if (auto attached = getAttachedObject(object))
+        attached->setTableView(q);
 }
 
 void QQuickTableViewPrivate::connectToModel()