Merge branch 'release/21.08'

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

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

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