diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-02 13:01:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-02 13:01:16 +0200 |
| commit | 6f96583e712309c5dfbae894e7464d7853494716 (patch) | |
| tree | 444af21cf7821881a5f81efc8e6d56a1df8bf23c /src/shared | |
| parent | b4241d454507c18c2f6f83d8c9d143fb00c0e4f8 (diff) | |
| parent | b05d6b04e0527953983cc0451015efa27fa58580 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Id63def71d27afe593d991478ebc44b7052194e47
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp index 0840176dc..9602b10d0 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp @@ -214,7 +214,11 @@ QString QtPropertyBrowserUtils::fontValueText(const QFont &f) QString QtPropertyBrowserUtils::dateFormat() { QLocale loc; - return loc.dateFormat(QLocale::ShortFormat); + QString format = loc.dateFormat(QLocale::ShortFormat); + // Change dd.MM.yy, MM/dd/yy to 4 digit years + if (format.count(QLatin1Char('y')) == 2) + format.insert(format.indexOf(QLatin1Char('y')), QLatin1String("yy")); + return format; } QString QtPropertyBrowserUtils::timeFormat() |