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

diff --cc src/kitemviews/kfileitemmodel.cpp
index c06f87e06ba8463b7a65c2c90c12d5ed2f3936f5,7b7c39ad74b643ae6c7ecc9867cdd8ffef46d05d..bd905bf07da126d8ddf2d1c3fe7a49e0c7bc3ac9
--- 1/src/kitemviews/kfileitemmodel.cpp
--- 2/src/kitemviews/kfileitemmodel.cpp
+++ b/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 = m_filteredItems.begin();
+     const QHash<KFileItem, ItemData*>::iterator end = m_filteredItems.end();
+ 
+     while (it != end) {
+         if (it.value()->parent) {
+             delete it.value();
+             it = m_filteredItems.erase(it);
+         } else {
+             ++it;
+         }
+     }
  }
  
  void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles)

diff --cc src/tests/kfileitemmodeltest.cpp
Simple merge