diff options
| author |   Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-16 18:16:04 +0300 |
| commit | 231d3670981a33ec42b91ad1cb33c1fc50551066 (patch) | |
| tree | b1ef1096f4e279baaa2ea0d2daf14b5c4185a82f /src/testlib/qabstractitemmodeltester.cpp | |
| parent | tst_QSslCertificate::verify - remove QSKIP (diff) | |
| parent | Android: Fix Application becomes unresponsive issue (diff) | |
| download | qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.tar.xz qtbase-231d3670981a33ec42b91ad1cb33c1fc50551066.zip | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: I0cdb390124e783dc9cd832a9954baa76a0e9eb6b
Diffstat (limited to 'src/testlib/qabstractitemmodeltester.cpp')
| -rw-r--r-- | src/testlib/qabstractitemmodeltester.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp index a85b291220..a2c643660a 100644 --- a/src/testlib/qabstractitemmodeltester.cpp +++ b/src/testlib/qabstractitemmodeltester.cpp @@ -720,12 +720,12 @@ void QAbstractItemModelTesterPrivate::rowsAboutToBeRemoved(const QModelIndex &pa Changing c; c.parent = parent; c.oldSize = model->rowCount(parent); - if (start > 0) { + if (start > 0 && model->columnCount(parent) > 0) { const QModelIndex startIndex = model->index(start - 1, 0, parent); MODELTESTER_VERIFY(startIndex.isValid()); c.last = model->data(startIndex); } - if (end < c.oldSize - 1) { + if (end < c.oldSize - 1 && model->columnCount(parent) > 0) { const QModelIndex endIndex = model->index(end + 1, 0, parent); MODELTESTER_VERIFY(endIndex.isValid()); c.next = model->data(endIndex); |