From: Méven Car Date: Tue, 16 Jun 2020 17:37:08 +0000 (+0200) Subject: Places: Use Solid::Device::DisplayName for DisplayRole X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c81927651a6f50af860b21d1be5c04bb4295b7cc?hp=799c532d239c2c04cb7fe5014aceba449268fd3d Places: Use Solid::Device::DisplayName for DisplayRole Summary: BUG: 415281 FIXED-IN: 20.08 Counter-part of D26113 Test Plan: Before: {F8215025} After: {F8215027} Reviewers: ngraham, #dolphin Reviewed By: ngraham, #dolphin Subscribers: broulik, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D26114 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ee0082a87..397f3161d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) set(QT_MIN_VERSION "5.11.0") -set(KF5_MIN_VERSION "5.70.0") +set(KF5_MIN_VERSION "5.71.0") # ECM setup find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index b06bac9a6..16ee5cff4 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -209,7 +209,7 @@ void PlacesItem::initializeDevice(const QString& udi) m_disc = m_device.as(); m_mtp = m_device.as(); - setText(m_device.description()); + setText(m_device.displayName()); setIcon(m_device.icon()); setIconOverlays(m_device.emblems()); setUdi(udi);