Merge branch 'release/20.12'

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 66770ee865edba216d0b561970fb8d7f411fc70a..ef174946b216d28565a8a6a3dc3e11a25ff8c771 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -486,7 +486,7 @@ void PlacesPanel::slotStorageSetupDone(int index, bool success)
 void PlacesPanel::slotShowTooltip()
 {
     const QUrl url = m_model->data(m_hoveredIndex).value("url").value<QUrl>();
-    const QString text = url.isLocalFile() ? url.path() : url.toString();
+    const QString text = url.toDisplayString(QUrl::PreferLocalFile);
     QToolTip::showText(m_hoverPos, text);
 }