Fix crash in the SQLQueryModel tests

Amend fd5f83e612729cebc5395c992bd98628bb9ea25f

calling fetchMore in create_mapping was a bad idea bacause it may lead
to infinite recurtion
Make a special case for hasChildren instead

Task-number: 250023
Reviewed-by: Marius Bugge Monsen
BT: yes

2 files changed, 9 insertions, 4 deletions

diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index b0137d2636..2c9eeeaf7b 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -274,9 +274,6 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping(
 
     Mapping *m = new Mapping;
 
-    if (model->canFetchMore(source_parent))
-        model->fetchMore(source_parent);
-
     int source_rows = model->rowCount(source_parent);
     for (int i = 0; i < source_rows; ++i) {
         if (q->filterAcceptsRow(i, source_parent))
@@ -1572,6 +1569,10 @@ bool QSortFilterProxyModel::hasChildren(const QModelIndex &parent) const
         return false;
     if (!d->model->hasChildren(source_parent))
         return false;
+
+    if (d->model->canFetchMore(source_parent))
+        return true; //we assume we might have children that can be fetched
+
     QSortFilterProxyModelPrivate::Mapping *m = d->create_mapping(source_parent).value();
     return m->source_rows.count() != 0 && m->source_columns.count() != 0;
 }
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 0509d494d7..4a749f0941 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -2596,7 +2596,11 @@ class QtTestModel: public QAbstractItemModel
         }
 
         void fetchMore(const QModelIndex &idx) {
+            if (fetched.contains(idx))
+                return;
+            beginInsertRows(idx, 0, rows-1);
             fetched.insert(idx);
+            endInsertRows();
         }
 
         bool hasChildren(const QModelIndex & = QModelIndex()) const {
@@ -2607,7 +2611,7 @@ class QtTestModel: public QAbstractItemModel
             return fetched.contains(parent) ? rows : 0;
         }
         int columnCount(const QModelIndex& parent = QModelIndex()) const {
-            return fetched.contains(parent) ? cols : 0;
+            return cols;
         }
 
         QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const