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

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

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

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