Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id96d4076610366a7cc66c8d8382ca25c33eaa71d

2 files changed, 3 insertions, 1 deletions

diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index a15e050939..70523815e8 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -3739,6 +3739,8 @@ QPair<int,int> QTreeViewPrivate::startAndEndColumns(const QRect &rect) const
 bool QTreeViewPrivate::hasVisibleChildren(const QModelIndex& parent) const
 {
     Q_Q(const QTreeView);
+    if (parent.flags() & Qt::ItemNeverHasChildren)
+        return false;
     if (model->hasChildren(parent)) {
         if (hiddenIndexes.isEmpty())
             return true;
diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
index a687d4665d..90e83cb58c 100644
--- a/src/widgets/itemviews/qtreeview_p.h
+++ b/src/widgets/itemviews/qtreeview_p.h
@@ -229,7 +229,7 @@ public:
         { viewItems[item].height = 0; }
 
     inline int accessibleTable2Index(const QModelIndex &index) const {
-        return (viewIndex(index) + (header ? 1 : 0)) * model->columnCount()+index.column() + 1;
+        return (viewIndex(index) + (header ? 1 : 0)) * model->columnCount()+index.column();
     }
 
     // used for spanning rows