SplitView: fix issue where Repeater items were not created

SplitView's contentItem is lazily created whenever contentItem() is called.
When adding regular, standalone items, they will go through
QQuickContainer::addItem(), which eventually calls contentItem(). This case
works fine.

Repeaters, on the other hand, call setTransparentForPositioner(true), which
QQuickContainerPrivate::contentData_append() checks for, and instead of calling
addItem(), reparents the Repeater to effectiveContentItem() with this line:

item->setParentItem(effectiveContentItem(p->contentItem));

If this happens before the contentItem is created, then the Repeater has no
parentItem and won't generate any items. So, instead of using the contentItem
member directly, call contentItem() to create it if it doesn't exist.

Fixes: QTBUG-79302
Change-Id: I258f7420d2fea843ed045d569f80e92fe1f507d2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 70 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index 47aaa1e2..5f38c5b9 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -383,7 +383,7 @@ void QQuickContainerPrivate::contentData_append(QQmlListProperty<QObject> *prop,
     QQuickItem *item = qobject_cast<QQuickItem *>(obj);
     if (item) {
         if (QQuickItemPrivate::get(item)->isTransparentForPositioner())
-            item->setParentItem(effectiveContentItem(p->contentItem));
+            item->setParentItem(effectiveContentItem(q->contentItem()));
         else if (p->contentModel->indexOf(item, nullptr) == -1)
             q->addItem(item);
     } else {
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index 76572a00..c125b99e 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -146,6 +146,13 @@ TestCase {
             implicitWidth: defaultHorizontalHandleWidth
             implicitHeight: defaultVerticalHandleHeight
             color: "#444"
+
+            Text {
+                text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
+                color: "white"
+                anchors.centerIn: parent
+                rotation: 90
+            }
         }
     }
 
@@ -834,6 +841,36 @@ TestCase {
         }
     }
 
+    Component {
+        id: repeaterSplitViewComponent
+
+        SplitView {
+            anchors.fill: parent
+            handle: handleComponent
+
+            property alias repeater: repeater
+
+            Repeater {
+                id: repeater
+                model: 3
+                delegate: Rectangle {
+                    objectName: "rectDelegate" + index
+
+                    SplitView.preferredWidth: 25
+
+                    color: "#aaff0000"
+
+                    Text {
+                        text: parent.x + "," + parent.y + " " + parent.width + "x" + parent.height
+                        color: "white"
+                        rotation: 90
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+    }
+
     function test_dragHandle_data() {
         var splitViewWidth = testCase.width - splitViewMargins * 2
         var splitViewHeight = testCase.height - splitViewMargins * 2
@@ -1092,6 +1129,28 @@ TestCase {
                     { x: 25 + 100 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
                     { x: 25 + 100 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 100, height: splitViewHeight }
                 ]
+            },
+            {
+                tag: "repeater",
+                component: repeaterSplitViewComponent,
+                orientation: Qt.Horizontal,
+                fillIndex: 2,
+                handleIndex: 1,
+                newHandlePos: Qt.point(200, testCase.height / 2),
+                expectedGeometriesBeforeDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 * 2 + defaultHorizontalHandleWidth * 2, y: 0, width: splitViewWidth - 70 , height: splitViewHeight }
+                ],
+                expectedGeometriesAfterDrag: [
+                    { x: 0, y: 0, width: 25, height: splitViewHeight },
+                    { x: 25, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 25 + defaultHorizontalHandleWidth, y: 0, width: 105, height: splitViewHeight },
+                    { x: 140, y: 0, width: defaultHorizontalHandleWidth, height: splitViewHeight },
+                    { x: 150, y: 0, width: 150, height: splitViewHeight }
+                ]
             }
         ]
         return data
@@ -1122,6 +1181,7 @@ TestCase {
         var targetHandle = handles[data.handleIndex]
         mousePress(targetHandle)
         verify(control.resizing)
+        // newHandlePos is in scene coordinates, so map it to coordinates local to the handle.
         var localPos = testCase.mapToItem(targetHandle, data.newHandlePos.x, data.newHandlePos.y)
         mouseMove(targetHandle, localPos.x - targetHandle.width / 2, localPos.y - targetHandle.height / 2)
         verify(control.resizing)
@@ -1957,4 +2017,13 @@ TestCase {
         // Shouldn't be an assertion failure.
         control.visible = false
     }
+
+    // QTBUG-79302: ensure that the Repeater's items are actually generated.
+    // test_dragHandle:repeater tests dragging behavior with a Repeater.
+    function test_repeater(data) {
+        var control = createTemporaryObject(repeaterSplitViewComponent, testCase)
+        verify(control)
+        compare(control.repeater.count, 3)
+        compare(control.contentChildren.length, 3)
+    }
 }