diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-28 10:49:58 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-28 10:49:58 +0200 |
commit | b31d58be194c205decf087dacdc6bdb5cf443d71 (patch) | |
tree | fd3b24155e261a7cc0e45e65a31882c23c4dbf93 | |
parent | 44fe49e573539e22709c2d5c996f1ca9ee8fd760 (diff) | |
parent | afd3352889d9e92063f5894984ff08c04418147b (diff) | |
download | qtquickcontrols-b31d58be194c205decf087dacdc6bdb5cf443d71.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
-rw-r--r-- | src/controls/Private/TreeViewItemDelegateLoader.qml | 2 |
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 |