mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'release/20.12'
This commit is contained in:
commit
1b192c67f9
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue