Merge branch 'master' into kf6

diff --cc src/dolphincontextmenu.cpp
Simple merge

diff --cc src/dolphinmainwindow.cpp
Simple merge

diff --cc src/dolphinnavigatorswidgetaction.cpp
Simple merge

diff --cc src/dolphinnewfilemenu.cpp
Simple merge

diff --cc src/dolphinpart.cpp
Simple merge

diff --cc src/dolphinpart_ext.cpp
Simple merge

diff --cc src/dolphintabbar.cpp
Simple merge

diff --cc src/dolphintabwidget.cpp
Simple merge

diff --cc src/dolphinviewcontainer.cpp
Simple merge

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

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

diff --cc src/panels/folders/treeviewcontextmenu.cpp
Simple merge

diff --cc src/panels/information/informationpanel.cpp
Simple merge

diff --cc src/panels/information/informationpanelcontent.cpp
Simple merge

diff --cc src/panels/information/phononwidget.cpp
Simple merge

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

diff --cc src/settings/contextmenu/contextmenusettingspage.cpp
Simple merge

diff --cc src/settings/general/previewssettingspage.cpp
Simple merge

diff --cc src/settings/kcm/kcmdolphingeneral.cpp
Simple merge

diff --cc src/settings/kcm/kcmdolphinnavigation.cpp
Simple merge

diff --cc src/settings/kcm/kcmdolphinviewmodes.cpp
Simple merge

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

diff --cc src/settings/startup/startupsettingspage.cpp
Simple merge

diff --cc src/settings/trash/trashsettingspage.cpp
index d21b4833e86918986b5d947dbcb1d704924af0f2,1920cd904cec99a6a5b348346905ff3dff6e8362..38a3d086581053d84a92f26df1aef6b4ac886778
--- 1/src/settings/trash/trashsettingspage.cpp
--- 2/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@@ -42,5 -40,7 +42,7 @@@ void TrashSettingsPage::restoreDefaults
  
  void TrashSettingsPage::loadSettings()
  {
 -    m_proxy->load();
 +    m_kcm->load();
  }
+ 
+ #include "moc_trashsettingspage.cpp"

diff --cc src/settings/userfeedback/userfeedbacksettingspage.cpp
Simple merge

diff --cc src/trash/dolphintrash.cpp
Simple merge

diff --cc src/userfeedback/dolphinfeedbackprovider.cpp
Simple merge

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

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

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