diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 68cd7e8451..936a6edfe7 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -40,7 +40,7 @@ #include "qcalendarwidget.h" #include -#include +#include #include #include #include @@ -1583,13 +1583,12 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event) } } -// ### Qt6: QStyledItemDelegate -class QCalendarDelegate : public QItemDelegate +class QCalendarDelegate : public QStyledItemDelegate { Q_OBJECT public: QCalendarDelegate(QCalendarWidgetPrivate *w, QObject *parent = nullptr) - : QItemDelegate(parent), calendarWidgetPrivate(w) + : QStyledItemDelegate(parent), calendarWidgetPrivate(w) { } virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; @@ -1706,7 +1705,7 @@ void QCalendarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt QRect rect = option.rect; calendarWidgetPrivate->paintCell(painter, rect, date); } else { - QItemDelegate::paint(painter, option, index); + QStyledItemDelegate::paint(painter, option, index); } } @@ -1717,7 +1716,7 @@ void QCalendarDelegate::paintCell(QPainter *painter, const QRect &rect, QDate da int col = -1; calendarWidgetPrivate->m_model->cellForDate(date, &row, &col); QModelIndex idx = calendarWidgetPrivate->m_model->index(row, col); - QItemDelegate::paint(painter, storedOption, idx); + QStyledItemDelegate::paint(painter, storedOption, idx); } QCalendarWidgetPrivate::QCalendarWidgetPrivate()