Merge branch 'Applications/17.08'

3 files changed, 6 insertions, 6 deletions

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index bef6a8b73..5fcec9241 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1051,14 +1051,14 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->mimeData(),
                          event->buttons(),
                          event->modifiers());
-    dropUrls(destUrl, &dropEvent);
+    dropUrls(destUrl, &dropEvent, this);
 
     setActive(true);
 }
 
-void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent)
+void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)
 {
-    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, this);
+    KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
 
     if (job) {
         connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 6b62b5da6..5c832efd1 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -363,9 +363,9 @@ public slots:
     void pasteIntoFolder();
 
     /**
-     * Handles a drop of @p dropEvent onto @p destUrl
+     * Handles a drop of @p dropEvent onto widget @p dropWidget and destination @p destUrl
      */
-    void dropUrls(const QUrl &destUrl, QDropEvent *dropEvent);
+    void dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget);
 
     void stopLoading();
 
diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h
index fe77b1e6e..3153f06ef 100644
--- a/src/views/draganddrophelper.h
+++ b/src/views/draganddrophelper.h
@@ -41,7 +41,7 @@ public:
      * @param destUrl   URL of the item destination. Is used only if destItem::isNull()
      *                  is true.
      * @param event     Drop event.
-     * @param window    Associated widget.
+     * @param window    Widget where the drop happened, will be used as parent of the drop menu.
      * @return          KIO::DropJob pointer
      */
     static KIO::DropJob* dropUrls(const QUrl& destUrl,