[Places Panel] Pass iconName to KFilePlaceEditDialog

Ensures that editing an entry with a custom icon doesn't have its icon discarded.

Differential Revision: https://phabricator.kde.org/D21558

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 224eb0c64da52337faf41b341cb3e385e72b97a2..4e99daf7a711b599269a772cba5406a30951d5b9 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -490,9 +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) {