diff options
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 936a6edfe7..6a4abc2113 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1927,7 +1927,6 @@ void QCalendarWidgetPrivate::_q_nextMonthClicked() void QCalendarWidgetPrivate::_q_yearEditingFinished() { Q_Q(QCalendarWidget); - yearButton->setText(q->locale().toString(yearEdit->value())); yearEdit->hide(); q->setFocusPolicy(oldFocusPolicy); qApp->removeEventFilter(q); @@ -1936,6 +1935,7 @@ void QCalendarWidgetPrivate::_q_yearEditingFinished() QDate currentDate = getCurrentDate(); int newYear = q->locale().toInt(yearEdit->text()); currentDate = currentDate.addYears(newYear - currentDate.year(m_model->m_calendar), m_model->m_calendar); + yearButton->setText(q->locale().toString(currentDate, u"yyyy", m_model->m_calendar)); updateCurrentPage(currentDate); } diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp index ecea005535..ccaf593497 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp @@ -185,6 +185,10 @@ void tst_QCalendarWidget::buttonClickCheck() QTest::mouseMove(widget); QTest::mouseClick(widget, Qt::LeftButton); QCOMPARE(2006, object.yearShown()); + QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2); + QTest::mouseMove(widget); + QTest::mouseClick(widget, Qt::LeftButton); + QCOMPARE(button->text(), "2006"); // Check that it is shown as a year should be object.setSelectedDate(selectedDate); object.showSelectedDate(); QTest::keyClick(widget, Qt::Key_Down); |