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

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

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

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

diff --cc src/tests/CMakeLists.txt
Simple merge