rpms / deepin-calendar

Clone
Source Code
GIT

Files

  1.   eb2303bc11acd3c6e9897ec71440f289c7ecce01
  2.   0001-fix-qt.patch
Blob Blame History Raw 
From 3e13b5715ac50347ca9e8a5d71c9a09dd253a542 Mon Sep 17 00:00:00 2001
From: chenhaifeng <chenhaifeng@uniontech.com>
Date: Fri, 18 Sep 2020 17:31:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20qt=E9=AB=98=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加必要头文件

Log: qt高版本无法编译

link:
Change-Id: Ibd98f8d6c31b8d5d16720ca2f3133833e536c582
Reviewed-on: http://gerrit.uniontech.com/c/nanjing/dde-calendar/+/5529
Reviewed-by: cuizhen <cuizhen@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: luzhou <luzhou@uniontech.com>
Tested-by: <mailman@uniontech.com>
---
 src/customWidget/customframe.cpp            | 1 +
 src/customWidget/scheduleview.cpp           | 1 +
 src/customWidget/todybutton.cpp             | 1 +
 src/dialog/schceduledlg.cpp                 | 1 +
 src/view/alldayeventview.cpp                | 1 +
 src/view/draginfographicsview.cpp           | 7 +++++++
 src/view/graphicsview.cpp                   | 1 +
 src/view/monthgraphiview.cpp                | 3 +++
 src/widget/calendarmainwindow.cpp           | 1 +
 src/widget/dayWidget/daymonthview.cpp       | 3 +++
 src/widget/monthWidget/monthview.cpp        | 1 +
 src/widget/monthWidget/monthwindow.cpp      | 1 +
 src/widget/schcedulesearchview.cpp          | 3 +++
 src/widget/weekWidget/weekheadview.cpp      | 2 ++
 src/widget/weekWidget/weekview.cpp          | 1 +
 src/widget/yearWidget/yearschceduleview.cpp | 1 +
 src/widget/yearWidget/yearview.cpp          | 1 +
 src/widget/yearWidget/yearwindow.cpp        | 2 ++
 18 files changed, 32 insertions(+)

diff --git a/src/customWidget/customframe.cpp b/src/customWidget/customframe.cpp
index eb049d0..af68a7c 100644
--- a/src/customWidget/customframe.cpp
+++ b/src/customWidget/customframe.cpp
@@ -25,6 +25,7 @@
 
 #include <QPainter>
 #include <QFontMetrics>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 CustomFrame::CustomFrame(QWidget *parent)
diff --git a/src/customWidget/scheduleview.cpp b/src/customWidget/scheduleview.cpp
index 57000b1..28118dd 100644
--- a/src/customWidget/scheduleview.cpp
+++ b/src/customWidget/scheduleview.cpp
@@ -31,6 +31,7 @@
 #include <QShortcut>
 #include <QVBoxLayout>
 #include <QApplication>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 
diff --git a/src/customWidget/todybutton.cpp b/src/customWidget/todybutton.cpp
index b5c86c9..03e6641 100644
--- a/src/customWidget/todybutton.cpp
+++ b/src/customWidget/todybutton.cpp
@@ -24,6 +24,7 @@
 #include <DPalette>
 
 #include <QPainter>
+#include <QMouseEvent>
 
 DGUI_USE_NAMESPACE
 CTodyButton::CTodyButton(QWidget *parent)
diff --git a/src/dialog/schceduledlg.cpp b/src/dialog/schceduledlg.cpp
index 3be2635..f5e808f 100644
--- a/src/dialog/schceduledlg.cpp
+++ b/src/dialog/schceduledlg.cpp
@@ -36,6 +36,7 @@
 #include <QTextBlock>
 #include <QToolButton>
 #include <QVBoxLayout>
+#include <QKeyEvent>
 
 DGUI_USE_NAMESPACE
 CSchceduleDlg::CSchceduleDlg(int type, QWidget *parent, const bool isAllDay)
diff --git a/src/view/alldayeventview.cpp b/src/view/alldayeventview.cpp
index cb50f7f..6f2f6ff 100644
--- a/src/view/alldayeventview.cpp
+++ b/src/view/alldayeventview.cpp
@@ -42,6 +42,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QGraphicsOpacityEffect>
+#include <QWheelEvent>
 
 DGUI_USE_NAMESPACE
 
diff --git a/src/view/draginfographicsview.cpp b/src/view/draginfographicsview.cpp
index de125e9..f4d5ea9 100644
--- a/src/view/draginfographicsview.cpp
+++ b/src/view/draginfographicsview.cpp
@@ -30,6 +30,13 @@
 #include <QJsonParseError>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QContextMenuEvent>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
 
 DragInfoGraphicsView::DragInfoGraphicsView(DWidget *parent)
     : DGraphicsView(parent)
diff --git a/src/view/graphicsview.cpp b/src/view/graphicsview.cpp
index 25189c5..b48cedb 100644
--- a/src/view/graphicsview.cpp
+++ b/src/view/graphicsview.cpp
@@ -39,6 +39,7 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
+#include <QWheelEvent>
 
 DGUI_USE_NAMESPACE
 CGraphicsView::CGraphicsView(QWidget *parent, int viewType)
diff --git a/src/view/monthgraphiview.cpp b/src/view/monthgraphiview.cpp
index b5e856f..eaa2477 100644
--- a/src/view/monthgraphiview.cpp
+++ b/src/view/monthgraphiview.cpp
@@ -30,6 +30,9 @@
 #include <QAction>
 #include <QMimeData>
 #include <QShortcut>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QPainterPath>
 
 bool CDayGraphicsItem::m_LunarVisible = false;
 
diff --git a/src/widget/calendarmainwindow.cpp b/src/widget/calendarmainwindow.cpp
index 7a2ecd2..ea4ae68 100644
--- a/src/widget/calendarmainwindow.cpp
+++ b/src/widget/calendarmainwindow.cpp
@@ -50,6 +50,7 @@
 #include <QSpacerItem>
 #include <QWidget>
 #include <QMenuBar>
+#include <QMouseEvent>
 
 #include <com_deepin_daemon_calendar_scheduler.h>
 
diff --git a/src/widget/dayWidget/daymonthview.cpp b/src/widget/dayWidget/daymonthview.cpp
index faf16a6..18ddf29 100644
--- a/src/widget/dayWidget/daymonthview.cpp
+++ b/src/widget/dayWidget/daymonthview.cpp
@@ -37,6 +37,9 @@
 #include <QTime>
 #include <QQueue>
 #include <QSpacerItem>
+#include <QMouseEvent>
+#include <QWheelEvent>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 CDayMonthView::CDayMonthView(QWidget *parent)
diff --git a/src/widget/monthWidget/monthview.cpp b/src/widget/monthWidget/monthview.cpp
index cd53427..717f026 100644
--- a/src/widget/monthWidget/monthview.cpp
+++ b/src/widget/monthWidget/monthview.cpp
@@ -36,6 +36,7 @@
 #include <QQueue>
 #include <QShortcut>
 #include <QApplication>
+#include <QMouseEvent>
 
 DGUI_USE_NAMESPACE
 void CMonthView::setTheMe(int type)
diff --git a/src/widget/monthWidget/monthwindow.cpp b/src/widget/monthWidget/monthwindow.cpp
index 281e0da..b7d0e22 100644
--- a/src/widget/monthWidget/monthwindow.cpp
+++ b/src/widget/monthWidget/monthwindow.cpp
@@ -29,6 +29,7 @@
 
 #include <QMessageBox>
 #include <QPainter>
+#include <QWheelEvent>
 
 DGUI_USE_NAMESPACE
 CMonthWindow::CMonthWindow(QWidget *parent)
diff --git a/src/widget/schcedulesearchview.cpp b/src/widget/schcedulesearchview.cpp
index ad86edf..93b6fd9 100644
--- a/src/widget/schcedulesearchview.cpp
+++ b/src/widget/schcedulesearchview.cpp
@@ -37,6 +37,9 @@
 #include <QHBoxLayout>
 #include <QStylePainter>
 #include <QRect>
+#include <QMouseEvent>
+#include <QContextMenuEvent>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 CSchceduleSearchItem::CSchceduleSearchItem(QWidget *parent)
diff --git a/src/widget/weekWidget/weekheadview.cpp b/src/widget/weekWidget/weekheadview.cpp
index b7766c9..68d4622 100644
--- a/src/widget/weekWidget/weekheadview.cpp
+++ b/src/widget/weekWidget/weekheadview.cpp
@@ -33,6 +33,8 @@
 #include <QTime>
 #include <QQueue>
 #include <QMenu>
+#include <QMouseEvent>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 CWeekHeadView::CWeekHeadView(QWidget *parent)
diff --git a/src/widget/weekWidget/weekview.cpp b/src/widget/weekWidget/weekview.cpp
index 3956978..3b54cbe 100644
--- a/src/widget/weekWidget/weekview.cpp
+++ b/src/widget/weekWidget/weekview.cpp
@@ -31,6 +31,7 @@
 #include <QMessageBox>
 #include <QWheelEvent>
 #include <QtGlobal>
+#include <QMouseEvent>
 
 DWIDGET_USE_NAMESPACE
 
diff --git a/src/widget/yearWidget/yearschceduleview.cpp b/src/widget/yearWidget/yearschceduleview.cpp
index b50c7d8..3c90a3c 100644
--- a/src/widget/yearWidget/yearschceduleview.cpp
+++ b/src/widget/yearWidget/yearschceduleview.cpp
@@ -36,6 +36,7 @@
 #include <QHBoxLayout>
 #include <QStylePainter>
 #include <QRect>
+#include <QMouseEvent>
 
 DGUI_USE_NAMESPACE
 
diff --git a/src/widget/yearWidget/yearview.cpp b/src/widget/yearWidget/yearview.cpp
index 86061ab..8468d5d 100644
--- a/src/widget/yearWidget/yearview.cpp
+++ b/src/widget/yearWidget/yearview.cpp
@@ -41,6 +41,7 @@
 #include <QLocale>
 #include <QDesktopWidget>
 #include <QMouseEvent>
+#include <QPainterPath>
 
 DGUI_USE_NAMESPACE
 CYearSchceduleOutView      *CYearView::m_Scheduleview = nullptr;
diff --git a/src/widget/yearWidget/yearwindow.cpp b/src/widget/yearWidget/yearwindow.cpp
index c8b7128..aad8e01 100644
--- a/src/widget/yearWidget/yearwindow.cpp
+++ b/src/widget/yearWidget/yearwindow.cpp
@@ -27,6 +27,8 @@
 
 #include <QMessageBox>
 #include <QMenuBar>
+#include <QMouseEvent>
+#include <QWheelEvent>
 
 DGUI_USE_NAMESPACE
 CYearWindow::CYearWindow(QWidget *parent)
-- 
2.26.2
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.