Skip to content

Commit 8e92808

Browse files
lichaofan2008deepin-bot[bot]
authored andcommitted
feat: issues of compile on Qt5.
Adapted to the v20 system, issues of compile on Qt5. 适配v20系统,完成Qt5环境的编译流程。 v20 BUG 分支合一到v25主线 Task: https://pms.uniontech.com/task-view-383475.html
1 parent f696237 commit 8e92808

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

libimageviewer/movieservice.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <QtDebug>
1313
#include <QJsonDocument>
1414
#include <QTemporaryDir>
15+
#include <QRegularExpression>
1516
#include "unionimage/baseutils.h"
1617
#include "service/ffmpegvideothumbnailer.h"
1718

libimageviewer/viewpanel/scen/imagegraphicsview.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,8 +1653,11 @@ void LibImageGraphicsView::wheelEvent(QWheelEvent *event)
16531653

16541654
qreal factor = qPow(1.2, event->angleDelta().y() / 240.0);
16551655
qDebug() << factor;
1656+
#if QT_VERSION_MAJOR >= 6
16561657
scaleAtPoint(event->position().toPoint(), factor);
1657-
1658+
#else
1659+
scaleAtPoint(event->pos(), factor);
1660+
#endif
16581661
event->accept();
16591662
}
16601663
}

0 commit comments

Comments
 (0)