Merge branch 'Applications/19.04'

diff --combined src/panels/places/placespanel.cpp
index 41f50e740f88efeccda20aa801011e03c1982afd,4e99daf7a711b599269a772cba5406a30951d5b9..a2f0e06556769d122afad8176843dffefc2d28af
--- 1/src/panels/places/placespanel.cpp
--- 2/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@@ -93,8 -93,8 +93,8 @@@ bool PlacesPanel::urlChanged(
  void PlacesPanel::readSettings()
  {
      if (m_controller) {
 -      const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
 -      m_controller->setAutoActivationDelay(delay);
 +        const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
 +        m_controller->setAutoActivationDelay(delay);
      }
  }
  
@@@ -490,9 -490,10 +490,10 @@@ void PlacesPanel::editEntry(int index
      QHash<QByteArray, QVariant> data = m_model->data(index);
      const QUrl url = data.value("url").toUrl();
      const QString text = data.value("text").toString();
+     const QString iconName = data.value("iconName").toString();
      const bool applicationLocal = !data.value("applicationName").toString().isEmpty();
  
-     QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, QString(), true, applicationLocal, KIconLoader::SizeMedium, this);
+     QPointer<KFilePlaceEditDialog> dialog = new KFilePlaceEditDialog(true, url, text, iconName, true, applicationLocal, KIconLoader::SizeMedium, this);
      if (dialog->exec() == QDialog::Accepted) {
          PlacesItem* oldItem = m_model->placesItem(index);
          if (oldItem) {