Fix delegate loading issue in gallery example

The delegate component in DelegatePage.qml uses properties from
the context where loader exists. This behavior of Loader seems to
be changed and it doesn't forward properties. Thus, property
reference through required properties doesn't work in the component
that's getting loaded, with ComponentBehavior configured as Bound.

This patch makes a workaround by moving the component within Loader
scope and access model properties through its id.

Fixes: QTBUG-117062
Pick-to: 6.6 6.5
Change-Id: Ib1f21f842f9926a426fb79f2fbb2536ed53f98d8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 106 insertions, 118 deletions

diff --git a/examples/quickcontrols/gallery/pages/DelegatePage.qml b/examples/quickcontrols/gallery/pages/DelegatePage.qml
index d03d3964d6..5d4c6b9db2 100644
--- a/examples/quickcontrols/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols/gallery/pages/DelegatePage.qml
@@ -39,121 +39,6 @@ Pane {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            readonly property var delegateComponentMap: {
-                "ItemDelegate": itemDelegateComponent,
-                "SwipeDelegate": swipeDelegateComponent,
-                "CheckDelegate": checkDelegateComponent,
-                "RadioDelegate": radioDelegateComponent,
-                "SwitchDelegate": switchDelegateComponent
-            }
-
-            Component {
-                id: itemDelegateComponent
-
-                ItemDelegate {
-                    text: value
-                    width: ListView.view.width
-
-                    required property string value
-                }
-            }
-
-            Component {
-                id: swipeDelegateComponent
-
-                SwipeDelegate {
-                    id: swipeDelegate
-                    text: value
-                    width: ListView.view.width
-
-                    required property string value
-                    required property Loader delegateItem
-                    required property ListView view
-                    required property int ourIndex
-
-                    Component {
-                        id: removeComponent
-
-                        Rectangle {
-                            color: SwipeDelegate.pressed ? "#333" : "#444"
-                            width: parent.width
-                            height: parent.height
-                            clip: true
-
-                            SwipeDelegate.onClicked: swipeDelegate.view.model.remove(swipeDelegate.ourIndex)
-
-                            Label {
-                                font.pixelSize: swipeDelegate.font.pixelSize
-                                text: qsTr("Remove")
-                                color: "white"
-                                anchors.centerIn: parent
-                            }
-                        }
-                    }
-
-                    SequentialAnimation {
-                        id: removeAnimation
-
-                        PropertyAction {
-                            target: swipeDelegate.delegateItem
-                            property: "ListView.delayRemove"
-                            value: true
-                        }
-                        NumberAnimation {
-                            target: swipeDelegate
-                            property: "height"
-                            to: 0
-                            easing.type: Easing.InOutQuad
-                        }
-                        PropertyAction {
-                            target: swipeDelegate.delegateItem
-                            property: "ListView.delayRemove"
-                            value: false
-                        }
-                    }
-
-                    swipe.left: removeComponent
-                    swipe.right: removeComponent
-                    ListView.onRemove: removeAnimation.start()
-                }
-            }
-
-            Component {
-                id: checkDelegateComponent
-
-                CheckDelegate {
-                    text: value
-
-                    required property string value
-                }
-            }
-
-            ButtonGroup {
-                id: radioButtonGroup
-            }
-
-            Component {
-                id: radioDelegateComponent
-
-                RadioDelegate {
-                    text: value
-
-                    required property string value
-
-                    ButtonGroup.group: radioButtonGroup
-                }
-            }
-
-            Component {
-                id: switchDelegateComponent
-
-                SwitchDelegate {
-                    text: value
-
-                    required property string value
-                }
-            }
-
             model: ListModel {
                 ListElement { type: "ItemDelegate"; value: qsTr("ItemDelegate1") }
                 ListElement { type: "ItemDelegate"; value: qsTr("ItemDelegate2") }
@@ -175,16 +60,119 @@ Pane {
             delegate: Loader {
                 id: delegateLoader
                 width: ListView.view.width
-                sourceComponent: listView.delegateComponentMap[type]
+                sourceComponent: delegateComponentMap[type]
 
                 required property string value
                 required property string type
                 required property var model
                 required property int index
 
-                property Loader delegateItem: delegateLoader
                 property ListView view: listView
-                property int ourIndex: index
+
+                readonly property var delegateComponentMap: {
+                    "ItemDelegate": itemDelegateComponent,
+                    "SwipeDelegate": swipeDelegateComponent,
+                    "CheckDelegate": checkDelegateComponent,
+                    "RadioDelegate": radioDelegateComponent,
+                    "SwitchDelegate": switchDelegateComponent
+                }
+
+                Component {
+                    id: itemDelegateComponent
+
+                    ItemDelegate {
+                        text: delegateLoader.value
+                        width: delegateLoader.width
+                    }
+                }
+
+                Component {
+                    id: swipeDelegateComponent
+
+                    SwipeDelegate {
+                        id: swipeDelegate
+                        text: delegateLoader.value
+                        width: delegateLoader.width
+
+                        Component {
+                            id: removeComponent
+
+                            Rectangle {
+                                color: SwipeDelegate.pressed ? "#333" : "#444"
+                                width: parent.width
+                                height: parent.height
+                                clip: true
+
+                                SwipeDelegate.onClicked: {
+                                    if (delegateLoader.view !== undefined)
+                                        delegateLoader.view.model.remove(delegateLoader.index)
+                                }
+
+                                Label {
+                                    font.pixelSize: swipeDelegate.font.pixelSize
+                                    text: qsTr("Remove")
+                                    color: "white"
+                                    anchors.centerIn: parent
+                                }
+                            }
+                        }
+
+                        SequentialAnimation {
+                            id: removeAnimation
+
+                            PropertyAction {
+                                target: delegateLoader
+                                property: "ListView.delayRemove"
+                                value: true
+                            }
+                            NumberAnimation {
+                                target: swipeDelegate
+                                property: "height"
+                                to: 0
+                                easing.type: Easing.InOutQuad
+                            }
+                            PropertyAction {
+                                target: delegateLoader
+                                property: "ListView.delayRemove"
+                                value: false
+                            }
+                        }
+
+                        swipe.left: removeComponent
+                        swipe.right: removeComponent
+                        ListView.onRemove: removeAnimation.start()
+                    }
+                }
+
+                Component {
+                    id: checkDelegateComponent
+
+                    CheckDelegate {
+                        text: delegateLoader.value
+                    }
+                }
+
+                ButtonGroup {
+                    id: radioButtonGroup
+                }
+
+                Component {
+                    id: radioDelegateComponent
+
+                    RadioDelegate {
+                        text: delegateLoader.value
+
+                        ButtonGroup.group: radioButtonGroup
+                    }
+                }
+
+                Component {
+                    id: switchDelegateComponent
+
+                    SwitchDelegate {
+                        text: delegateLoader.value
+                    }
+                }
             }
         }
     }