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

diff --cc src/dolphincontextmenu.cpp
Simple merge

diff --cc src/dolphinmainwindow.cpp
Simple merge

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/kitemviews/kstandarditemlistwidget.h
Simple merge

diff --cc src/kitemviews/private/kitemlistheaderwidget.cpp
Simple merge

diff --cc src/panels/places/placespanel.cpp
Simple merge

diff --cc src/settings/contextmenu/contextmenusettingspage.cpp
index 5e755d249d97cd39fade45a25c308d7cb6756a4c,23ddfba31deed43f865162294b397e845266879c..1c83e477ea43305d559b85fd805705c6a8752182
--- 1/src/settings/contextmenu/contextmenusettingspage.cpp
--- 2/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@@ -7,9 -7,9 +7,8 @@@
  #include "contextmenusettingspage.h"
  
  #include "dolphin_contextmenusettings.h"
- #include "dolphin_generalsettings.h"
  #include "dolphin_versioncontrolsettings.h"
  #include "global.h"
 -#include "settings/serviceitemdelegate.h"
  #include "settings/servicemodel.h"
  
  #include <KDesktopFile>

diff --cc src/settings/dolphinsettingsdialog.cpp
Simple merge

diff --cc src/views/dolphinview.cpp
Simple merge