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

Make t specifier for time-zone only apply to date-time

Browse Source 
It previously applied to dates and date-times, but was documented as
applying to times (and date-times then included it by reference).
It's only meaningful for a date-time.

Change-Id: Id9e8e8cb987b03e5ddc77b05c581b9b6944065fc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-03-25 15:46:32 +01:00
parent 5c1446e3fa
commit 89dc1a1865
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/time/qdatetime.cpp
View File

@ -2533,7 +2533,6 @@ QT_WARNING_POP
\row \li ap or a \row \li ap or a
\li Interpret as an am/pm time. \e a/ap will match a lower-case version \li Interpret as an am/pm time. \e a/ap will match a lower-case version
of either QLocale::amText() or QLocale::pmText(). of either QLocale::amText() or QLocale::pmText().
\row \li t \li the timezone (for example "CEST")
\endtable \endtable
All other input characters will be treated as text. Any non-empty sequence All other input characters will be treated as text. Any non-empty sequence
@ -5478,8 +5477,15 @@ QT_WARNING_POP
Uses the calendar \a cal if supplied, else Gregorian. Uses the calendar \a cal if supplied, else Gregorian.
See QDate::fromString() and QTime::fromString() for the expressions In addition to the expressions, recognized in the format string to represent
recognized in the format string to represent parts of the date and time. parts of the date and time, by QDate::fromString() and QTime::fromString(),
this method supports:
\table
\header \li Expression \li Output
\row \li t \li the timezone (for example "CEST")
\endtable
All other input characters will be treated as text. Any non-empty sequence All other input characters will be treated as text. Any non-empty sequence
of characters enclosed in single quotes will also be treated (stripped of of characters enclosed in single quotes will also be treated (stripped of
the quotes) as text and not be interpreted as expressions. the quotes) as text and not be interpreted as expressions.

2
src/corelib/time/qdatetimeparser.cpp
View File

@ -525,7 +525,7 @@ bool QDateTimeParser::parseFormat(const QString &newFormat)
} }
break; break;
case 't': case 't':
if (parserType != QMetaType::QTime) { if (parserType == QMetaType::QDateTime) {
const SectionNode sn = { TimeZoneSection, i - add, countRepeat(newFormat, i, 4), 0 }; const SectionNode sn = { TimeZoneSection, i - add, countRepeat(newFormat, i, 4), 0 };
newSectionNodes.append(sn); newSectionNodes.append(sn);
appendSeparator(&newSeparators, newFormat, index, i - index, lastQuote); appendSeparator(&newSeparators, newFormat, index, i - index, lastQuote);