Merge branch 'master' into frameworks

diff --cc src/dolphin.appdata.xml
Simple merge

diff --cc src/panels/places/placesitemmodel.cpp
Simple merge

diff --cc src/panels/places/placesitemmodel.h
index 38fcfe6af3085abe0464e5fed1caec02922938e2,7cbf99e95eb35feba4844eea5578d7ec83b9e65f..aa8bb16fe51e8c09cbf7804af39088deff693911
--- 1/src/panels/places/placesitemmodel.h
--- 2/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@@ -119,9 -121,17 +119,17 @@@ public
       *         the corresponding IO-slave. Virtual URLs for bookmarks are used to
       *         be independent from internal format changes.
       */
 -    static KUrl convertedUrl(const KUrl& url);
 +    static QUrl convertedUrl(const QUrl& url);
  
 -    virtual void clear();
 +    virtual void clear() Q_DECL_OVERRIDE;
+ 
+     /**
+      * Saves the bookmarks and indicates to other applications that the
+      * state of the bookmarks has been changed. Is only called by the
+      * timeout of m_saveBookmarksTimer to prevent unnecessary savings.
+      */
+     void saveBookmarks();
+ 
  signals:
      void errorMessage(const QString& message);
      void storageSetupDone(int index, bool success);

diff --cc src/panels/places/placespanel.cpp
index 631b6b69df82e52844907f9535f7a882271021d0,6b840ef570295626ed2c3983d948ae3d2ed1b462..5618cee2162a534fb6031eb4850319d85c8fd0da
--- 1/src/panels/places/placespanel.cpp
--- 2/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@@ -402,14 -407,18 +404,15 @@@ void PlacesPanel::slotItemDropEventStor
  void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
  {
      m_model->dropMimeDataBefore(index, event->mimeData());
+     m_model->saveBookmarks();
  }
  
 -void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
 +void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent)
  {
 -    Q_UNUSED(parent);
 -    QString error;
 -    DragAndDropHelper::dropUrls(KFileItem(), dest, event, error);
 -    if (!error.isEmpty()) {
 -        emit errorMessage(error);
 +    KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent);
 +    if (job) {
 +        connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); });
      }
 -
  }
  
  void PlacesPanel::slotTrashUpdated(KJob* job)

diff --cc src/settings/kcm/kcmdolphingeneral.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinnavigation.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinservices.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinviewmodes.desktop
Simple merge