Git commit d395680268a78f9fb0b6d0f8d09a87a0cf87542e by Frank Reininghaus.
Committed on 30/09/2013 at 22:15.
Pushed by freininghaus into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.11'

M  +13   -0    dolphin/src/kitemviews/kfileitemmodel.cpp
M  +87   -1    dolphin/src/tests/kfileitemmodeltest.cpp

http://commits.kde.org/kde-baseapps/d395680268a78f9fb0b6d0f8d09a87a0cf87542e

diff --cc dolphin/src/kitemviews/kfileitemmodel.cpp
index c06f87e,7b7c39a..bd905bf
--- a/dolphin/src/kitemviews/kfileitemmodel.cpp
+++ b/dolphin/src/kitemviews/kfileitemmodel.cpp
@@@ -1177,8 -1192,24 +1177,21 @@@ void KFileItemModel::removeExpandedItem
          }
      }
  =

 -    // The m_expandedParentsCountRoot may not get reset before all items =
with
 -    // a bigger count have been removed.
      removeItems(expandedItems, DeleteItemData);
 -
      m_expandedDirs.clear();
+ =

+     // Also remove all filtered items which have a parent.
+     QHash<KFileItem, ItemData*>::iterator it =3D m_filteredItems.begin();
+     const QHash<KFileItem, ItemData*>::iterator end =3D m_filteredItems.e=
nd();
+ =

+     while (it !=3D end) {
+         if (it.value()->parent) {
+             delete it.value();
+             it =3D m_filteredItems.erase(it);
+         } else {
+             ++it;
+         }
+     }
  }
  =

  void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRange=
List& itemRanges, const QSet<QByteArray>& changedRoles)