Merge remote-tracking branch 'origin/master' into frameworks

Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:[email protected]

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 066af20f7..196172f1d 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -218,7 +218,7 @@ void KFileItemModel::setShowHiddenFiles(bool show)
     m_dirLister->setShowingDotFiles(show);
     m_dirLister->emitChanges();
     if (show) {
-        slotCompleted();
+        dispatchPendingItemsToInsert();
     }
 }