diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:31:05 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:31:05 +0200 |
commit | 90dbe2773f6c70a519a38c351dbb91f45dadc686 (patch) | |
tree | b55f93526d78c05661c6b349c13e8ead324e5bea | |
parent | d2a661f16e9982c45260efb9875b83c581b82287 (diff) | |
parent | b31d58be194c205decf087dacdc6bdb5cf443d71 (diff) | |
download | qtquickcontrols-90dbe2773f6c70a519a38c351dbb91f45dadc686.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie6006e2daf1ff578baf567aba8809df609a5dda5
-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 |