Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ifec879473540b609403ac951967f6d9ecb0bb6f0

1 files changed, 33 insertions, 28 deletions

diff --git a/src/qml/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml b/src/qml/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml
index 3d44f61668..d3f6176c70 100644
--- a/src/qml/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml
+++ b/src/qml/doc/snippets/qml/tablemodel/fruit-example-delegatechooser.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -65,32 +65,37 @@ ApplicationWindow {
         boundsBehavior: Flickable.StopAtBounds
 
         model: TableModel {
+            TableModelColumn { display: "checked" }
+            TableModelColumn { display: "amount" }
+            TableModelColumn { display: "fruitType" }
+            TableModelColumn { display: "fruitName" }
+            TableModelColumn { display: "fruitPrice" }
+
             // Each row is one type of fruit that can be ordered
 //![rows]
             rows: [
-                [
-                    // Each object (line) is one cell/column,
-                    // and each property in that object is a role.
-                    { checked: false, checkable: true },
-                    { amount: 1 },
-                    { fruitType: "Apple" },
-                    { fruitName: "Granny Smith" },
-                    { fruitPrice: 1.50 }
-                ],
-                [
-                    { checked: true, checkable: true },
-                    { amount: 4 },
-                    { fruitType: "Orange" },
-                    { fruitName: "Navel" },
-                    { fruitPrice: 2.50 }
-                ],
-                [
-                    { checked: false, checkable: true },
-                    { amount: 1 },
-                    { fruitType: "Banana" },
-                    { fruitName: "Cavendish" },
-                    { fruitPrice: 3.50 }
-                ]
+                {
+                    // Each property is one cell/column.
+                    checked: false,
+                    amount: 1,
+                    fruitType: "Apple",
+                    fruitName: "Granny Smith",
+                    fruitPrice: 1.50
+                },
+                {
+                    checked: true,
+                    amount: 4,
+                    fruitType: "Orange",
+                    fruitName: "Navel",
+                    fruitPrice: 2.50
+                },
+                {
+                    checked: false,
+                    amount: 1,
+                    fruitType: "Banana",
+                    fruitName: "Cavendish",
+                    fruitPrice: 3.50
+                }
             ]
 //![rows]
         }
@@ -99,15 +104,15 @@ ApplicationWindow {
             DelegateChoice {
                 column: 0
                 delegate: CheckBox {
-                    checked: model.checked
-                    onToggled: model.checked = checked
+                    checked: model.display
+                    onToggled: model.display = checked
                 }
             }
             DelegateChoice {
                 column: 1
                 delegate: SpinBox {
-                    value: model.amount
-                    onValueModified: model.amount = value
+                    value: model.display
+                    onValueModified: model.display = value
                 }
             }
             DelegateChoice {