diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:01:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:01:50 +0200 |
| commit | e43e9aaa1102c96289a42e787d79472c98f1820e (patch) | |
| tree | e99e3b8745260f61c10f9bf2d8ec9f15bac232cf | |
| parent | 6d19911c0db508a1c0079890a0adc8f6ab87bcf7 (diff) | |
| parent | a690022b7e56b2e36a95ef22b854af4c82c5fdc8 (diff) | |
| download | qttools-e43e9aaa1102c96289a42e787d79472c98f1820e.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0e4b55a4dd87223f15a6933b45e5bcb8c41ee439
| -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() |