解决冲突

2022-11-24 17:11:48 +08:00 · 2022-11-24 17:11:48 +08:00 · 42e5cc3d99
parent 0c5f578ab4 1038619690
commit 42e5cc3d99
2 changed files with 7 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+yhkylin-backup-tools (4.1.0.1-ok3) yangtze; urgency=medium
+
+  * 解决编译问题
+
+ -- Kevin Duan <duankaiwen@kylinos.com>  Tue, 01 Nov 2022 17:11:32 +0800
+
 yhkylin-backup-tools (4.1.0.1-ok2) yangtze; urgency=medium

  * BUG 号：无
--- a/kybackup/component/ringsprogressbar.cpp
+++ b/kybackup/component/ringsprogressbar.cpp
@ -1,6 +1,7 @@
 #include "ringsprogressbar.h"
 #include <QPainter>
 #include <QFont>
+#include <QPainterPath>

 #include "../../common/mydefine.h"
 #include "../gsettingswrapper.h"