diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
| commit | 9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch) | |
| tree | 98acb9a60cf237138f939b5dadb0d9ae7722ddeb /src/gui/widgets/qcalendarwidget.cpp | |
| parent | e9d32707afeddfdd2906af7bed60c375b1035dd6 (diff) | |
| parent | 3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qcalendarwidget.cpp')
| -rw-r--r-- | src/gui/widgets/qcalendarwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp index 31da850d5..8d5d0c737 100644 --- a/src/gui/widgets/qcalendarwidget.cpp +++ b/src/gui/widgets/qcalendarwidget.cpp @@ -332,10 +332,9 @@ QString QCalendarMonthValidator::text(const QDate &date, int repeat) const return str + QString::number(date.month()); } else if (repeat == 3) { return m_locale.standaloneMonthName(date.month(), QLocale::ShortFormat); - } else if (repeat >= 4) { + } else /*if (repeat >= 4)*/ { return m_locale.standaloneMonthName(date.month(), QLocale::LongFormat); } - return QString(); } ////////////////////////////////// |