diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:17 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 10:11:57 +0200 |
| commit | 6881e1613af3e31ca3cd6b297e7756bb61d2f038 (patch) | |
| tree | 5398aaf4536d6c3f93869cf671ee0dbc42072ae1 /src/corelib/itemmodels | |
| parent | 3ae34b7ead938dc716e2fad2fa686d6867466255 (diff) | |
| parent | 7f80c96432270e0097883e11e632c14cba68da28 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I172e3e19ddcc5b7665e6c8382d725e7cc4f9794f
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 6c7101d41f..7714aa5e46 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -942,13 +942,14 @@ static QItemSelection mergeRowLengths(const QVector<QPair<QPersistentModelIndex, const uint nextLength = rowLengths.at(i).second; if ((nextLength == length) && (next.row() == br.row() + 1) + && (next.column() == br.column()) && (next.parent() == br.parent())) { br = next; } else { break; } } - result.append(QItemSelectionRange(tl, br.sibling(br.row(), length - 1))); + result.append(QItemSelectionRange(tl, br.sibling(br.row(), br.column() + length - 1))); } return result; } |