From 885a6188204ceb1cf8887cbabbf21425abb858f4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 9 Feb 2023 16:13:18 +0200 Subject: [PATCH] QDropEvent::pos() is deprecated since 6.0. --- src/app/puzzle/scene/vpmaingraphicsview.cpp | 2 +- src/libs/vmisc/compatibility.h | 11 +++++++++++ src/libs/vwidgets/vmaingraphicsview.cpp | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/puzzle/scene/vpmaingraphicsview.cpp b/src/app/puzzle/scene/vpmaingraphicsview.cpp index a0937c81b..fa97bda09 100644 --- a/src/app/puzzle/scene/vpmaingraphicsview.cpp +++ b/src/app/puzzle/scene/vpmaingraphicsview.cpp @@ -205,7 +205,7 @@ void VPMainGraphicsView::dropEvent(QDropEvent *event) event->acceptProposedAction(); piece->ClearTransformations(); - piece->SetPosition(mapToScene(event->pos())); + piece->SetPosition(mapToScene(DropEventPos(event))); piece->SetZValue(1.0); auto *command = new VPUndoMovePieceOnSheet(layout->GetFocusedSheet(), piece); diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h index 31d043106..1f0f7c1b2 100644 --- a/src/libs/vmisc/compatibility.h +++ b/src/libs/vmisc/compatibility.h @@ -318,4 +318,15 @@ inline auto VLocaleCharacter(const QChar &character) -> QChar { return character; } + +//--------------------------------------------------------------------------------------------------------------------- +inline auto DropEventPos(const QDropEvent *event) -> QPoint +{ +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + return event->position().toPoint(); +#else + return event->pos(); +#endif +} + #endif // COMPATIBILITY_H diff --git a/src/libs/vwidgets/vmaingraphicsview.cpp b/src/libs/vwidgets/vmaingraphicsview.cpp index bee5e3363..c488b51ed 100644 --- a/src/libs/vwidgets/vmaingraphicsview.cpp +++ b/src/libs/vwidgets/vmaingraphicsview.cpp @@ -60,6 +60,7 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vmisc/literals.h" +#include "../vmisc/compatibility.h" #include "global.h" #include "../ifc/xml/utils.h" @@ -711,7 +712,7 @@ void VMainGraphicsView::dropEvent(QDropEvent *event) QFileInfo f(fileName); if (f.exists() && IsMimeTypeImage(QMimeDatabase().mimeTypeForFile(fileName))) { - emit currentScene->AddBackgroundImage(mapToScene(event->pos()), fileName); + emit currentScene->AddBackgroundImage(mapToScene(DropEventPos(event)), fileName); event->acceptProposedAction(); } }