From d9edad81177954c89619b6dee70ca76f2f4709ef Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 21 Sep 2020 15:58:35 +0200 Subject: Show the year correctly after it has been edited When converting the year as an integer via the locale then it can add in group separators which would not be desired here. Therefore it should be converted via the QDate approach to get the right output for the year. Fixes: QTBUG-86307 Fixes: QTBUG-85966 Pick-to: 5.15 Change-Id: I092bd1e5f69e544843fd5f28c96b94c9066490c5 Reviewed-by: Volker Hilsheimer --- tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/auto/widgets/widgets/qcalendarwidget') 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); -- cgit v1.2.3