diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /src/widgets/widgets/qcalendarwidget.cpp | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'src/widgets/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index ec19b64d4a..cc0c51b237 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2413,7 +2413,7 @@ void QCalendarWidget::showNextMonth() Q_D(const QCalendarWidget); int year = yearShown(); int month = monthShown(); - if (month == d->m_model->m_calendar.maxMonthsInYear()) { + if (month == d->m_model->m_calendar.maximumMonthsInYear()) { ++year; month = 1; } else { @@ -2437,7 +2437,7 @@ void QCalendarWidget::showPreviousMonth() int month = monthShown(); if (month == 1) { --year; - month = d->m_model->m_calendar.maxMonthsInYear(); + month = d->m_model->m_calendar.maximumMonthsInYear(); } else { --month; } |