diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
| commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
| tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /src/widgets/widgets/qcalendarwidget.cpp | |
| parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
| parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 9559b58339..4946969360 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1946,8 +1946,8 @@ void QCalendarWidgetPrivate::updateNavigationBar() QString monthName = q->locale().standaloneMonthName(m_model->m_shownMonth, QLocale::LongFormat); monthButton->setText(monthName); - yearButton->setText(QString::number(m_model->m_shownYear)); yearEdit->setValue(m_model->m_shownYear); + yearButton->setText(yearEdit->text()); } void QCalendarWidgetPrivate::update() |