Merge remote-tracking branch 'origin/5.4.2' into 5.4

Change-Id: I209def43673df62c75add4f623350fb1c98887a1

1 files changed, 13 insertions, 1 deletions

diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h
index c3bd1fb504..be5d4b7b71 100644
--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@@ -168,8 +168,20 @@ public:
         QModelIndex index;
         int col = -1;
         int row = -1;
+        const QMimeData *mime = event->mimeData();
+
+        // Drag enter event shall always be accepted, if mime type and action match.
+        // Whether the data can actually be dropped will be checked in drag move.
+        if (event->type() == QEvent::DragEnter) {
+            const QStringList modelTypes = model->mimeTypes();
+            for (int i = 0; i < modelTypes.count(); ++i)
+                if (mime->hasFormat(modelTypes.at(i))
+                    && (event->dropAction() & model->supportedDropActions()))
+                    return true;
+        }
+
         if (dropOn(event, &row, &col, &index)) {
-            return model->canDropMimeData(event->mimeData(),
+            return model->canDropMimeData(mime,
                                           dragDropMode == QAbstractItemView::InternalMove ? Qt::MoveAction : event->dropAction(),
                                           row, col, index);
         }