kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/20.12'

Browse source
This commit is contained in:
Elvis Angelaccio 2020-12-15 23:28:15 +01:00
parent 42cd439af8 aeea98837d
commit 1b192c67f9
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphincontextmenu.cpp
View file

@ -105,7 +105,6 @@ DolphinContextMenu::Command DolphinContextMenu::open()
} else if (m_context & ItemContext) { } else if (m_context & ItemContext) {
openItemContextMenu(); openItemContextMenu();
} else { } else {
Q_ASSERT(m_context == NoContext);
openViewportContextMenu(); openViewportContextMenu();
} }

2
src/dolphinviewcontainer.cpp
View file

@ -390,7 +390,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
m_searchBox->setVisible(enabled); m_searchBox->setVisible(enabled);
if (enabled) { if (enabled) {
const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl(); const QUrl& locationUrl = m_urlNavigator->locationUrl();
m_searchBox->fromSearchUrl(locationUrl); m_searchBox->fromSearchUrl(locationUrl);
} }