From 4c028c165976c8f4b30d40f7c07fe676b8c33d06 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 29 Jul 2020 21:40:03 +0200 Subject: [PATCH] Use position().toPoint() with Qt 6 --- src/playlist/playlisttabbar.cpp | 4 ++++ src/playlist/playlistview.cpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index 75ec31ad..6ca15ae3 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -357,7 +357,11 @@ void PlaylistTabBar::dragEnterEvent(QDragEnterEvent *e) { void PlaylistTabBar::dragMoveEvent(QDragMoveEvent *e) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + drag_hover_tab_ = tabAt(e->position().toPoint()); +#else drag_hover_tab_ = tabAt(e->pos()); +#endif if (drag_hover_tab_ != -1) { e->setDropAction(Qt::CopyAction); diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index a41903bf..0aec0b44 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -974,7 +974,12 @@ void PlaylistView::dragMoveEvent(QDragMoveEvent *event) { QTreeView::dragMoveEvent(event); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QModelIndex index(indexAt(event->position().toPoint())); +#else QModelIndex index(indexAt(event->pos())); +#endif + drop_indicator_row_ = index.isValid() ? index.row() : 0; }