whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct order of arguments when calling QCalendar::daysInMonth() 

Change-Id: Ic4e30d8ffea80c1dc1dc8da1f97f4bb0d21b63e3
Pick-to: 5.15
Fixes: QTBUG-83870
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Andy Shaw 2020-05-15 15:20:00 +02:00
parent 40c6fe88a4
commit 035c16e9ff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -186,7 +186,7 @@ QDate QCalendarDayValidator::applyToDate(QDate date, QCalendar cal) const
auto parts = cal.partsFromDate(date);
if (!parts.isValid())
return QDate();
parts.day = qMin(qMax(1, m_day), cal.daysInMonth(parts.year, parts.month));
parts.day = qMin(qMax(1, m_day), cal.daysInMonth(parts.month, parts.year));
return cal.dateFromParts(parts);
}
@ -292,7 +292,7 @@ QDate QCalendarMonthValidator::applyToDate(QDate date, QCalendar cal) const
if (!parts.isValid())
return QDate();
parts.month = qMin(qMax(1, m_month), cal.monthsInYear(parts.year));
parts.day = qMin(parts.day, cal.daysInMonth(parts.year, m_month)); // m_month or parts.month ?
parts.day = qMin(parts.day, cal.daysInMonth(m_month, parts.year)); // m_month or parts.month ?
return cal.dateFromParts(parts);
}
@ -401,7 +401,7 @@ QDate QCalendarYearValidator::applyToDate(QDate date, QCalendar cal) const
return QDate();
// This widget does not support negative years (some calendars may support)
parts.year = qMax(1, m_year);
parts.day = qMin(parts.day, cal.daysInMonth(parts.year, parts.month));
parts.day = qMin(parts.day, cal.daysInMonth(parts.month, parts.year));
return cal.dateFromParts(parts);
}
@ -1397,7 +1397,7 @@ QModelIndex QCalendarView::moveCursor(CursorAction cursorAction, Qt::KeyboardMod
case QAbstractItemView::MoveEnd: {
auto parts = cal.partsFromDate(currentDate);
if (parts.isValid()) {
parts.day = cal.daysInMonth(parts.year, parts.month);
parts.day = cal.daysInMonth(parts.month, parts.year);
currentDate = cal.dateFromParts(parts);
}
}
@ -2395,7 +2395,7 @@ void QCalendarWidget::setCurrentPage(int year, int month)
QDate currentDate = d->getCurrentDate();
QCalendar cal = d->m_model->m_calendar;
int day = currentDate.day(cal);
int daysInMonths = cal.daysInMonth(year, month);
int daysInMonths = cal.daysInMonth(month, year);
if (day > daysInMonths)
day = daysInMonths;