From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Wed, 5 Jul 2023 20:44:40 +0000 (+0200)
Subject: Merge branch 'master' into kf6
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f510339f033658eae27f8400bf042b78b36f82f2

Merge branch 'master' into kf6
---

f510339f033658eae27f8400bf042b78b36f82f2
diff --cc src/settings/trash/trashsettingspage.cpp
index d21b4833e,1920cd904..38a3d0865
--- a/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"