summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuca Beldi <v.ronin@yahoo.it>2021-04-23 15:35:29 +0100
committerLuca Beldi <v.ronin@yahoo.it>2021-04-26 13:44:51 +0100
commitfcea8e7aa8a65de9e80136c2d603478831b246d0 (patch)
tree5ccef0ad2ecb0486b4d6655f8aaeb064242d271a /src
parent3f98ff474f24604c79a2fcc645697ca30fc444de (diff)
Fix QAbstractItemModelTester false positive
When inserting rows to a branch with no columns the tester should not complain about indexes being invalid Pick-to: 6.1 6.0 5.15 Change-Id: I466f4e5140b10f6dcf65a71f109c2d3be7336507 Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/testlib/qabstractitemmodeltester.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp
index abb4ff7c60..ec7f43b5a4 100644
--- a/src/testlib/qabstractitemmodeltester.cpp
+++ b/src/testlib/qabstractitemmodeltester.cpp
@@ -455,7 +455,7 @@ void QAbstractItemModelTesterPrivate::parent()
// Common error test #2, make sure that a second level index has a parent
// that is the first level index.
- if (model->rowCount(topIndex) > 0) {
+ if (model->rowCount(topIndex) > 0 && model->columnCount(topIndex) > 0) {
QModelIndex childIndex = model->index(0, 0, topIndex);
MODELTESTER_VERIFY(childIndex.isValid());
MODELTESTER_COMPARE(model->parent(childIndex), topIndex);