From 3b0fc180ff407ba8b00df6b75084888f2559a441 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 18 Jul 2020 04:13:53 +0200
Subject: [PATCH] Make QListWidget::mimeData compatible with Qt 6

---
 src/covermanager/albumcovermanagerlist.cpp | 8 ++++++--
 src/covermanager/albumcovermanagerlist.h   | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/covermanager/albumcovermanagerlist.cpp b/src/covermanager/albumcovermanagerlist.cpp
index cbfe856bb..9798db2b6 100644
--- a/src/covermanager/albumcovermanagerlist.cpp
+++ b/src/covermanager/albumcovermanagerlist.cpp
@@ -23,13 +23,13 @@
 #include <memory>
 
 #include <QWidget>
+#include <QStringList>
+#include <QUrl>
 #include <QList>
 #include <QListView>
 #include <QListWidget>
 #include <QListWidgetItem>
-#include <QStringList>
 #include <QMimeData>
-#include <QUrl>
 #include <QDropEvent>
 
 #include "core/song.h"
@@ -40,7 +40,11 @@
 
 AlbumCoverManagerList::AlbumCoverManagerList(QWidget *parent) : QListWidget(parent), manager_(nullptr) {}
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+QMimeData *AlbumCoverManagerList::mimeData(const QList<QListWidgetItem*> &items) const {
+#else
 QMimeData *AlbumCoverManagerList::mimeData(const QList<QListWidgetItem*> items) const {
+#endif
 
   // Get songs
   SongList songs;
diff --git a/src/covermanager/albumcovermanagerlist.h b/src/covermanager/albumcovermanagerlist.h
index 1201e1564..413f059be 100644
--- a/src/covermanager/albumcovermanagerlist.h
+++ b/src/covermanager/albumcovermanagerlist.h
@@ -24,9 +24,9 @@
 #include "config.h"
 
 #include <QObject>
+#include <QString>
 #include <QList>
 #include <QListWidget>
-#include <QString>
 
 class QWidget;
 class QMimeData;
@@ -43,7 +43,12 @@ class AlbumCoverManagerList : public QListWidget {
   void set_cover_manager(AlbumCoverManager *manager) { manager_ = manager; }
 
  protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  QMimeData *mimeData(const QList<QListWidgetItem*> &items) const override;
+#else
   QMimeData *mimeData(const QList<QListWidgetItem*> items) const override;
+#endif
+
   void dropEvent(QDropEvent *event) override;
 
  private: