diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:44:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:44:49 +0100 |
| commit | 22daba4ff9bbc79b33e2ee61fd4219a221f38614 (patch) | |
| tree | 59902e7f88569c75693d1eebc4e61a4eb9019971 /src/widgets/itemviews | |
| parent | 943cb0999dbbf1da99c1358b81ea3298ee116447 (diff) | |
| parent | c53cccc171c2da803cfd247e95c5dd48e5610c3b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iaab37b633a8286c2c21425aaac34d30529a3ea82
Diffstat (limited to 'src/widgets/itemviews')
| -rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index 9aba17be70..4639b9e444 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -3755,7 +3755,8 @@ int QTreeViewPrivate::itemDecorationAt(const QPoint &pos) const bool spanned = false; if (!spanningIndexes.isEmpty()) { const QModelIndex index = q->indexAt(pos); - spanned = q->isFirstColumnSpanned(index.row(), index.parent()); + if (index.isValid()) + spanned = q->isFirstColumnSpanned(index.row(), index.parent()); } const int column = spanned ? 0 : header->logicalIndexAt(pos.x()); if (!isTreePosition(column)) |