From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Tue, 23 Jun 2020 15:42:06 +0000 (+0200)
Subject: Merge branch 'release/20.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d1baf3398e53931735b724672d5ae48649b44a18

Merge branch 'release/20.04'
---

d1baf3398e53931735b724672d5ae48649b44a18
diff --cc src/panels/places/placesitem.cpp
index 16ee5cff4,ea2270020..b1f24e401
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@@ -207,9 -207,9 +207,9 @@@ void PlacesItem::initializeDevice(cons
      m_access = m_device.as<Solid::StorageAccess>();
      m_volume = m_device.as<Solid::StorageVolume>();
      m_disc = m_device.as<Solid::OpticalDisc>();
-     m_mtp = m_device.as<Solid::PortableMediaPlayer>();
+     m_player = m_device.as<Solid::PortableMediaPlayer>();
  
 -    setText(m_device.description());
 +    setText(m_device.displayName());
      setIcon(m_device.icon());
      setIconOverlays(m_device.emblems());
      setUdi(udi);