]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix missing setDefaultShortcuts call
authorDavid Hallas <david@davidhallas.dk>
Tue, 1 Oct 2019 15:24:53 +0000 (17:24 +0200)
committerDavid Hallas <david@davidhallas.dk>
Thu, 3 Oct 2019 03:40:10 +0000 (05:40 +0200)
Summary:
The commit eec49bc38f4e256b66bf16ee5428c5f5d7e97e25 cased a warning to
be emitted when starting Dolphin:

KXMLGUIFactoryPrivate::saveDefaultActionProperties(): Shortcut for action  "go_forward" "&Forward" set with QAction::setShortcut()! Use KActionCollection::setDefaultShortcut(s) instead.

The fix is to call
actionCollection()->setDefaultShortcuts(m_forwardAction, m_forwardAction->shortcuts());
so that the default shortcuts are setup.

Reviewers: elvisangelaccio

Reviewed By: elvisangelaccio

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D24342

src/dolphinmainwindow.cpp

index 83dcd1b18eaa00ccd9d40ed00966f62b7d69eedf..ce2013798ddca711f321658ec1f7ab035cd2aafd 100644 (file)
@@ -1427,6 +1427,8 @@ void DolphinMainWindow::setupActions()
     connect(m_forwardAction->menu(), &QMenu::aboutToShow, this, &DolphinMainWindow::slotAboutToShowForwardPopupMenu);
     connect(m_forwardAction->menu(), &QMenu::triggered, this, &DolphinMainWindow::slotGoForward);
     actionCollection()->addAction(m_forwardAction->objectName(), m_forwardAction);
     connect(m_forwardAction->menu(), &QMenu::aboutToShow, this, &DolphinMainWindow::slotAboutToShowForwardPopupMenu);
     connect(m_forwardAction->menu(), &QMenu::triggered, this, &DolphinMainWindow::slotGoForward);
     actionCollection()->addAction(m_forwardAction->objectName(), m_forwardAction);
+    actionCollection()->setDefaultShortcuts(m_forwardAction, m_forwardAction->shortcuts());
+
     // enable middle-click to open in a new tab
     auto *middleClickEventFilter = new MiddleClickActionEventFilter(this);
     connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotBackForwardActionMiddleClicked);
     // enable middle-click to open in a new tab
     auto *middleClickEventFilter = new MiddleClickActionEventFilter(this);
     connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotBackForwardActionMiddleClicked);