Merge branch 'release/21.12'

This commit is contained in:
Kai Uwe Broulik 2021-12-18 15:17:39 +01:00
commit caf49dafa5

View file

@ -758,7 +758,7 @@ void DolphinMainWindow::slotAboutToShowBackPopupMenu()
int entries = 0;
m_backAction->menu()->clear();
for (int i = urlNavigator->historyIndex() + 1; i < urlNavigator->historySize() && entries < MaxNumberOfNavigationentries; ++i, ++entries) {
QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_backAction->menu());
QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_backAction->menu());
action->setData(i);
m_backAction->menu()->addAction(action);
}
@ -787,7 +787,7 @@ void DolphinMainWindow::slotAboutToShowForwardPopupMenu()
int entries = 0;
m_forwardAction->menu()->clear();
for (int i = urlNavigator->historyIndex() - 1; i >= 0 && entries < MaxNumberOfNavigationentries; --i, ++entries) {
QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_forwardAction->menu());
QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_forwardAction->menu());
action->setData(i);
m_forwardAction->menu()->addAction(action);
}