Merge branch 'master' into kf6

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/dolphinmainwindow.cpp
Simple merge

diff --cc src/dolphinnavigatorswidgetaction.cpp
Simple merge

diff --cc src/dolphintabbar.cpp
Simple merge

diff --cc src/dolphinviewcontainer.cpp
Simple merge

diff --cc src/kitemviews/kfileitemmodel.cpp
index 4b06525f5156108e02bf49196fc871365497449e,629332703685f561b75dd18261fcf95ab19f5570..28e0876b9ed4d5c21a024b1d6f7fbf053a589bb1
--- 1/src/kitemviews/kfileitemmodel.cpp
--- 2/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@@ -235,9 -240,35 +239,31 @@@ bool KFileItemModel::sortHiddenLast() c
      return m_sortHiddenLast;
  }
  
+ void KFileItemModel::setShowTrashMime(bool show)
+ {
+     const auto trashMime = QStringLiteral("application/x-trash");
+     QStringList excludeFilter = m_filter.excludeMimeTypes();
+     bool wasShown = !excludeFilter.contains(trashMime);
+ 
+     if (show) {
+         if (!wasShown) {
+             excludeFilter.removeAll(trashMime);
+         }
+     } else {
+         if (wasShown) {
+             excludeFilter.append(trashMime);
+         }
+     }
+ 
+     if (wasShown != show) {
+         setExcludeMimeTypeFilter(excludeFilter);
+     }
+ }
+ 
  void KFileItemModel::setShowHiddenFiles(bool show)
  {
 -#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0)
 -    m_dirLister->setShowingDotFiles(show);
 -#else
      m_dirLister->setShowHiddenFiles(show);
 -#endif
+     setShowTrashMime(show);
      m_dirLister->emitChanges();
      if (show) {
          dispatchPendingItemsToInsert();

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

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