Merge branch 'master' of git.kde.org:dolphin

6 files changed, 12 insertions, 14 deletions

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 3ad1bf3ff..276cf5672 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -240,7 +240,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
                              event->buttons(),
                              event->modifiers());
 
-        KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.url(), &dropEvent, this);
+        KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.mostLocalUrl(), &dropEvent, this);
         if (job) {
             connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); });
         }
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 6bfc4ed01..d519ff121 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -314,14 +314,12 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
         m_preview->setVisible(isChecked);
         InformationPanelSettings::setPreviewsShown(isChecked);
     } else if (action == configureAction) {
-        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
+        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(this);
         dialog->setDescription(i18nc("@label::textbox",
                                      "Select which data should be shown in the information panel:"));
         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
         connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData);
     }
 }
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index a04064d0b..b32f8204d 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -276,12 +276,12 @@ void PlacesItem::initializeDevice(const QString& udi)
         Solid::Block *block = m_device.as<Solid::Block>();
         if (block) {
             const QString device = block->device();
-            setUrl(QStringLiteral("audiocd:/?device=%1").arg(device));
+            setUrl(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device)));
         } else {
-            setUrl(QStringLiteral("audiocd:/"));
+            setUrl(QUrl(QStringLiteral("audiocd:/")));
         }
     } else if (m_mtp) {
-        setUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()));
+        setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi())));
     }
 }
 
diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index 7daaba602..ec845e0ae 100644
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -33,7 +33,7 @@ public:
 protected:
     virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
 
-    virtual QPalette::ColorRole normalTextColorRole() const;
+    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
 };
 #endif
 
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index a42cb0403..25c4d51f6 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -1099,17 +1099,17 @@ QUrl PlacesItemModel::createTimelineUrl(const QUrl& url)
         const int year = date.year();
         const int month = date.month();
         const int day = date.day();
-        timelineUrl = "timeline:/" + timelineDateString(year, month) +
-              '/' + timelineDateString(year, month, day);
+        timelineUrl = QUrl("timeline:/" + timelineDateString(year, month) +
+              '/' + timelineDateString(year, month, day));
     } else if (path.endsWith(QLatin1String("thismonth"))) {
         const QDate date = QDate::currentDate();
-        timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
+        timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month()));
     } else if (path.endsWith(QLatin1String("lastmonth"))) {
         const QDate date = QDate::currentDate().addMonths(-1);
-        timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month());
+        timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month()));
     } else {
         Q_ASSERT(path.endsWith(QLatin1String("today")));
-        timelineUrl= url;
+        timelineUrl = url;
     }
 
     return timelineUrl;
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 81aeedb28..0c8b5f7f2 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -52,7 +52,7 @@ protected:
     virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 public slots:
-    virtual void readSettings();
+    virtual void readSettings() Q_DECL_OVERRIDE;
 
 private slots:
     void slotItemActivated(int index);