Search results: Fix that auto-expand failed on first set of results

They were expanded but collapsed again when the model was reset in the
setShowReplaceUI(bool show) call. Avoid resetting the model by informing
about the data change individually.

Change-Id: I48a94f2aec5b5d31d11166a299a2463b757939fa
Task-number: QTCREATORBUG-14320
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
index d7809160a2..b5f9c6741a 100644
--- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp
+++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
@@ -57,9 +57,21 @@ SearchResultTreeModel::~SearchResultTreeModel()
 
 void SearchResultTreeModel::setShowReplaceUI(bool show)
 {
-    beginResetModel();
     m_showReplaceUI = show;
-    endResetModel();
+    // We cannot send dataChanged for the whole hierarchy in one go,
+    // because all items in a dataChanged must have the same parent.
+    // Send dataChanged for each parent of children individually...
+    QList<QModelIndex> changeQueue;
+    changeQueue.append(QModelIndex());
+    while (!changeQueue.isEmpty()) {
+        const QModelIndex current = changeQueue.takeFirst();
+        int childCount = rowCount(current);
+        if (childCount > 0) {
+            emit dataChanged(index(0, 0, current), index(childCount - 1, 0, current));
+            for (int r = 0; r < childCount; ++r)
+                changeQueue.append(index(r, 0, current));
+        }
+    }
 }
 
 void SearchResultTreeModel::setTextEditorFont(const QFont &font, const SearchResultColor &color)