1 files changed, 53 insertions, 23 deletions

diff --git a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
index cb454c0d46..1a354d12d9 100644
--- a/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
+++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
@@ -1,13 +1,15 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
+pragma ComponentBehavior: Bound
 import QtQuick
 import QtQml.Models
 
 Rectangle {
     id: root
 
-    width: 300; height: 400
+    width: 300
+    height: 400
 
     Component {
         id: dragDelegate
@@ -16,8 +18,15 @@ Rectangle {
             id: dragArea
 
             property bool held: false
-
-            anchors { left: parent.left; right: parent.right }
+            required property string name
+            required property string type
+            required property string size
+            required property int age
+
+            anchors {
+                left: parent?.left
+                right: parent?.right
+            }
             height: content.height
 
             enabled: visualModel.sortOrder == visualModel.lessThan.length
@@ -35,7 +44,8 @@ Rectangle {
                     horizontalCenter: parent.horizontalCenter
                     verticalCenter: parent.verticalCenter
                 }
-                width: dragArea.width; height: column.implicitHeight + 4
+                width: dragArea.width
+                height: column.implicitHeight + 4
 
                 border.width: 1
                 border.color: "lightsteelblue"
@@ -53,28 +63,40 @@ Rectangle {
                 states: State {
                     when: dragArea.held
 
-                    ParentChange { target: content; parent: root }
+                    ParentChange {
+                        target: content
+                        parent: root
+                    }
                     AnchorChanges {
                         target: content
-                        anchors { horizontalCenter: undefined; verticalCenter: undefined }
+                        anchors {
+                            horizontalCenter: undefined
+                            verticalCenter: undefined
+                        }
                     }
                 }
 
                 Column {
                     id: column
-                    anchors { fill: parent; margins: 2 }
+                    anchors {
+                        fill: parent
+                        margins: 2
+                    }
 
-                    Text { text: 'Name: ' + name }
-                    Text { text: 'Type: ' + type }
-                    Text { text: 'Age: ' + age }
-                    Text { text: 'Size: ' + size }
+                    Text { text: qsTr('Name: ') + dragArea.name }
+                    Text { text: qsTr('Type: ') + dragArea.type }
+                    Text { text: qsTr('Age: ') + dragArea.age }
+                    Text { text: qsTr('Size: ') + dragArea.size }
                 }
             }
 
             DropArea {
-                anchors { fill: parent; margins: 10 }
+                anchors {
+                    fill: parent
+                    margins: 10
+                }
 
-                onEntered: (drag)=> {
+                onEntered: (drag) => {
                     visualModel.items.move(
                             drag.source.DelegateModel.itemsIndex,
                             dragArea.DelegateModel.itemsIndex)
@@ -110,11 +132,11 @@ Rectangle {
 //![6]
 //![3]
         function insertPosition(lessThan, item) {
-            var lower = 0
-            var upper = items.count
+            let lower = 0
+            let upper = items.count
             while (lower < upper) {
-                var middle = Math.floor(lower + (upper - lower) / 2)
-                var result = lessThan(item.model, items.get(middle).model);
+                const middle = Math.floor(lower + (upper - lower) / 2)
+                const result = lessThan(item.model, items.get(middle).model)
                 if (result) {
                     upper = middle
                 } else {
@@ -126,8 +148,8 @@ Rectangle {
 
         function sort(lessThan) {
             while (unsortedItems.count > 0) {
-                var item = unsortedItems.get(0)
-                var index = insertPosition(lessThan, item)
+                const item = unsortedItems.get(0)
+                const index = insertPosition(lessThan, item)
 
                 item.groups = "items"
                 items.move(item.itemsIndex, index)
@@ -162,7 +184,10 @@ Rectangle {
         id: view
 
         anchors {
-            left: parent.left; top: parent.top; right: parent.right; bottom: orderSelector.top;
+            left: parent.left
+            top: parent.top
+            right: parent.right
+            bottom: orderSelector.top
             margins: 2
         }
 
@@ -175,9 +200,14 @@ Rectangle {
     ListSelector {
         id: orderSelector
 
-        anchors { left: parent.left; right: parent.right; bottom: parent.bottom; margins: 2 }
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            margins: 2
+        }
 
-        label: "Sort By"
-        list: [ "Name", "Type", "Age", "Size", "Custom" ]
+        label: qsTr("Sort By")
+        list: [ qsTr("Name"), qsTr("Type"), qsTr("Age"), qsTr("Size"), qsTr("Custom") ]
     }
 }