1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document that am/pm in QDateTime::toString are locale-specific

Browse Source 
Change-Id: I28382b25ac94cbfbad4acff1308ddd8baf5ca693
Task-number: QTBUG-55632
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Kai Koehne 2016-09-01 13:29:46 +02:00 committed by Edward Welbourne
parent 8796c69480
commit d023b300b2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/tools/qdatetime.cpp
View File

@ -1623,9 +1623,11 @@ QString QTime::toString(Qt::DateFormat format) const
\row \li z \li the milliseconds without leading zeroes (0 to 999) \row \li z \li the milliseconds without leading zeroes (0 to 999)
\row \li zzz \li the milliseconds with leading zeroes (000 to 999) \row \li zzz \li the milliseconds with leading zeroes (000 to 999)
\row \li AP or A \row \li AP or A
\li use AM/PM display. \e A/AP will be replaced by either "AM" or "PM". \li use AM/PM display. \e A/AP will be replaced by either
QLocale::amText() or QLocale::pmText().
\row \li ap or a \row \li ap or a
\li use am/pm display. \e a/ap will be replaced by either "am" or "pm". \li use am/pm display. \e a/ap will be replaced by a lower-case version of
QLocale::amText() or QLocale::pmText().
\row \li t \li the timezone (for example "CEST") \row \li t \li the timezone (for example "CEST")
\endtable \endtable
@ -1634,7 +1636,8 @@ QString QTime::toString(Qt::DateFormat format) const
expression. Two consecutive single quotes ("''") are replaced by a singlequote expression. Two consecutive single quotes ("''") are replaced by a singlequote
in the output. Formats without separators (e.g. "HHmm") are currently not supported. in the output. Formats without separators (e.g. "HHmm") are currently not supported.
Example format strings (assuming that the QTime is 14:13:09.042) Example format strings (assuming that the QTime is 14:13:09.042 and the system
locale is \c{en_US})
\table \table
\header \li Format \li Result \header \li Format \li Result