From 8e3496a6cebbbcb8ffd46326c52e1fbfbcd10021 Mon Sep 17 00:00:00 2001
From: Knud Dollereder <knud.dollereder@qt.io>
Date: Wed, 2 Feb 2022 14:16:47 +0100
Subject: [PATCH] Do not call endResetModel twice

Moved beginResetModel/endResetModel calls out of
ItemLibrary::updateVisibility into the calling functions.
This way endResetModel is not called twice in ItemLibraryModel::update.

Change-Id: I9588ba97aeb9da7c5a629612c9b3dc6315859501
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/itemlibrary/itemlibrarymodel.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 9c856c99289..d15109e61e0 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -234,8 +234,11 @@ void ItemLibraryModel::showAllHiddenCategories()
 void ItemLibraryModel::setFlowMode(bool b)
 {
     m_flowMode = b;
-    bool changed;
-    updateVisibility(&changed);
+    bool changed = false;
+    if (updateVisibility(&changed); changed) {
+        beginResetModel();
+        endResetModel();
+    }
 }
 
 ItemLibraryModel::ItemLibraryModel(QObject *parent)
@@ -308,7 +311,10 @@ void ItemLibraryModel::setSearchText(const QString &searchText)
         m_searchText = lowerSearchText;
 
         bool changed = false;
-        updateVisibility(&changed);
+        if (updateVisibility(&changed); changed) {
+            beginResetModel();
+            endResetModel();
+        }
 
         selectImportFirstVisibleCategory();
     }
@@ -592,11 +598,6 @@ void ItemLibraryModel::updateVisibility(bool *changed)
         if (!m_searchText.isEmpty() && hasVisibleItems && !import->importExpanded())
             import->setImportExpanded();
     }
-
-    if (changed) {
-        beginResetModel();
-        endResetModel();
-    }
 }
 
 void ItemLibraryModel::addRoleNames()