summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-28 10:49:58 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-28 10:49:58 +0200
commitafd3352889d9e92063f5894984ff08c04418147b (patch)
treefd3b24155e261a7cc0e45e65a31882c23c4dbf93
parent44fe49e573539e22709c2d5c996f1ca9ee8fd760 (diff)
parent84fbb48832e984c7fce1c4091adb0d340974a75f (diff)
downloadqtquickcontrols-afd3352889d9e92063f5894984ff08c04418147b.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Idc2e5ad567f83eb85d51d1e21c38bcd96436a24f
-rw-r--r--src/controls/Private/TreeViewItemDelegateLoader.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/TreeViewItemDelegateLoader.qml b/src/controls/Private/TreeViewItemDelegateLoader.qml
index e19215ed..ed9566af 100644
--- a/src/controls/Private/TreeViewItemDelegateLoader.qml
+++ b/src/controls/Private/TreeViewItemDelegateLoader.qml
@@ -81,7 +81,7 @@ TableViewItemDelegateLoader {
readonly property color textColor: __rowItem ? __rowItem.itemTextColor : "black"
readonly property string role: __column ? __column.role : ""
readonly property var value: model && model.hasOwnProperty(role) ? model[role] : ""
- readonly property var index: model ? model["_q_TreeView_ModelIndex"] : __treeModel.index(-1,-1,null)
+ readonly property var index: model ? model["_q_TreeView_ModelIndex"] : __treeModel.index(-1,-1)
readonly property int depth: model && column === 0 ? model["_q_TreeView_ItemDepth"] : 0
readonly property bool hasChildren: model ? model["_q_TreeView_HasChildren"] : false
readonly property bool hasSibling: model ? model["_q_TreeView_HasSibling"] : false