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 ee0082a8797e4e5626bced2353310654b0087eff..397f3161d55cf3eaee9bb33accf9c5e06915d50d 100644 (file)
--- 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")
 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)
 
 # 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 b06bac9a693576d2a7d31644ae11cba077ef4646..16ee5cff4c2dd3d4833f07b0d03ea25925cb8f7a 100644 (file)
--- 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<Solid::OpticalDisc>();
     m_mtp = m_device.as<Solid::PortableMediaPlayer>();
 
     m_disc = m_device.as<Solid::OpticalDisc>();
     m_mtp = m_device.as<Solid::PortableMediaPlayer>();
 

-    setText(m_device.description());
+    setText(m_device.displayName());

     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);
     setIcon(m_device.icon());
     setIconOverlays(m_device.emblems());
     setUdi(udi);