Merge remote-tracking branch 'origin/Applications/18.12'

diff --combined src/panels/places/placesitemmodel.cpp
index 86fbf886da4f30f5333bc58930d78d1ce9236ca3,66bdbd57aa881f592bf75c2e1dd5138b44b00277..7513a25d522309db65de2a823f7777a3f386012a
--- 1/src/panels/places/placesitemmodel.cpp
--- 2/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@@ -78,14 -78,12 +78,14 @@@ PlacesItemModel::~PlacesItemModel(
  {
  }
  
 -void PlacesItemModel::createPlacesItem(const QString& text,
 -                                       const QUrl& url,
 -                                       const QString& iconName,
 -                                       int after)
 +void PlacesItemModel::createPlacesItem(const QString &text, const QUrl &url, const QString &iconName, const QString &appName)
  {
 -    m_sourceModel->addPlace(text, url, iconName, {}, mapToSource(after));
 +    createPlacesItem(text, url, iconName, appName, -1);
 +}
 +
 +void PlacesItemModel::createPlacesItem(const QString &text, const QUrl &url, const QString &iconName, const QString &appName, int after)
 +{
 +    m_sourceModel->addPlace(text, url, iconName, appName, mapToSource(after));
  }
  
  PlacesItem* PlacesItemModel::placesItem(int index) const
@@@ -371,7 -369,7 +371,7 @@@ void PlacesItemModel::dropMimeDataBefor
                  continue;
              }
  
 -            createPlacesItem(text, url, KIO::iconNameForUrl(url), qMax(0, index - 1));
 +            createPlacesItem(text, url, KIO::iconNameForUrl(url), {}, qMax(0, index - 1));
          }
      }
      // will save bookmark alteration and fix sort if that is broken by the drag/drop operation
@@@ -473,7 -471,8 +473,8 @@@ void PlacesItemModel::slotStorageTearDo
      if (error && errorData.isValid()) {
          emit errorMessage(errorData.toString());
      }
-     m_deviceToTearDown->disconnect();
+     disconnect(m_deviceToTearDown, &Solid::StorageAccess::teardownDone,
+                this, &PlacesItemModel::slotStorageTearDownDone);
      m_deviceToTearDown = nullptr;
  }