From 71c4d39a565a35d7b11b060991eb53d597266796 Mon Sep 17 00:00:00 2001 From: lichaofan Date: Tue, 23 Dec 2025 10:53:17 +0800 Subject: [PATCH] feat: issues of compile on Qt5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adapted to the v20 system, issues of compile on Qt5. 适配v20系统，完成Qt5环境的编译流程。 v20 BUG 分支合一到v25主线 Task: https://pms.uniontech.com/task-view-383475.html --- libimageviewer/movieservice.cpp | 1 + libimageviewer/viewpanel/scen/imagegraphicsview.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libimageviewer/movieservice.cpp b/libimageviewer/movieservice.cpp index de9ddce3..889f7496 100644 --- a/libimageviewer/movieservice.cpp +++ b/libimageviewer/movieservice.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include "unionimage/baseutils.h" #include "service/ffmpegvideothumbnailer.h" diff --git a/libimageviewer/viewpanel/scen/imagegraphicsview.cpp b/libimageviewer/viewpanel/scen/imagegraphicsview.cpp index eaa732a4..1928bfd1 100644 --- a/libimageviewer/viewpanel/scen/imagegraphicsview.cpp +++ b/libimageviewer/viewpanel/scen/imagegraphicsview.cpp @@ -1653,8 +1653,11 @@ void LibImageGraphicsView::wheelEvent(QWheelEvent *event) qreal factor = qPow(1.2, event->angleDelta().y() / 240.0); qDebug() << factor; +#if QT_VERSION_MAJOR >= 6 scaleAtPoint(event->position().toPoint(), factor); - +#else + scaleAtPoint(event->pos(), factor); +#endif event->accept(); } }