From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Tue, 4 Jun 2019 06:59:02 +0000 (+0200)
Subject: Merge branch 'Applications/19.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0bc919bd4758a84ccc0928ff784223984ec5df88?ds=inline;hp=-c

Merge branch 'Applications/19.04'
---

0bc919bd4758a84ccc0928ff784223984ec5df88
diff --combined src/panels/places/placespanel.cpp
index 41f50e740,4e99daf7a..a2f0e0655
--- a/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) {