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

diff --cc src/kitemviews/kfileitemmodel.cpp
Simple merge

diff --cc src/kitemviews/kfileitemmodel.h
index f364e7ce0f406881a9454b54e8947f2a73b32dd4,c87ee9736d3812b5a5296b097efeec3da02df106..841016138c4a67691177ae9d759eae6399adc762
--- 1/src/kitemviews/kfileitemmodel.h
--- 2/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@@ -319,10 -319,15 +319,17 @@@ private
       */
      QList<ItemData*> createItemDataList(const KUrl& parentUrl, const KFileItemList& items) const;
  
 +    static int expandedParentsCount(const ItemData* data);
 +
      void removeExpandedItems();
  
+     /**
+      * This function is called by setData() and slotRefreshItems(). It emits
+      * the itemsChanged() signal, checks if the sort order is still correct,
+      * and starts m_resortAllItemsTimer if that is not the case.
+      */
+     void emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles);
+ 
      /**
       * Resets all values from m_requestRole to false.
       */

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