From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Fri, 28 Jul 2017 12:08:33 +0000 (+0200)
Subject: Merge branch 'Applications/17.08'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/39fcc8945051365ae240e0bf92fcb3403d77caed?hp=-c

Merge branch 'Applications/17.08'
---

39fcc8945051365ae240e0bf92fcb3403d77caed
diff --combined src/dolphinmainwindow.cpp
index 194666be3,658b89006..fe34c306f
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -98,6 -98,8 +98,8 @@@ DolphinMainWindow::DolphinMainWindow() 
      m_updateToolBarTimer(0),
      m_lastHandleUrlStatJob(0)
  {
+     Q_INIT_RESOURCE(dolphin);
+ 
      setObjectName(QStringLiteral("Dolphin#"));
  
      connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
@@@ -1317,7 -1319,7 +1319,7 @@@ void DolphinMainWindow::updateEditActio
  
          KActionCollection* col = actionCollection();
          QAction* renameAction      = col->action(QStringLiteral("rename"));
 -        QAction* moveToTrashAction = col->action(QStringLiteral("move_to_trash"));
 +        QAction* moveToTrashAction = col->action(KStandardAction::name(KStandardAction::MoveToTrash));
          QAction* deleteAction      = col->action(KStandardAction::name(KStandardAction::DeleteFile));
          QAction* cutAction         = col->action(KStandardAction::name(KStandardAction::Cut));
          QAction* deleteWithTrashShortcut = col->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler