summaryrefslogtreecommitdiffstats
path: root/src/corelib/time/qdatetime.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-03-25 15:46:32 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-04-23 12:11:35 +0200
commit89dc1a1865dd8ed277b88a53262b79a93c2ba8dc (patch)
tree8e2cd80b768e1398dc35aa121256830207fcbef4 /src/corelib/time/qdatetime.cpp
parent5c1446e3faf7684dfa559edc49611b92ea825776 (diff)
Make t specifier for time-zone only apply to date-time
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>
Diffstat (limited to 'src/corelib/time/qdatetime.cpp')
-rw-r--r--src/corelib/time/qdatetime.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index 8553f79d90..c2b741f7ca 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -2533,7 +2533,6 @@ QT_WARNING_POP
\row \li ap or a
\li Interpret as an am/pm time. \e a/ap will match a lower-case version
of either QLocale::amText() or QLocale::pmText().
- \row \li t \li the timezone (for example "CEST")
\endtable
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.
- See QDate::fromString() and QTime::fromString() for the expressions
- recognized in the format string to represent parts of the date and time.
+ In addition to the expressions, recognized in the format string to represent
+ 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
of characters enclosed in single quotes will also be treated (stripped of
the quotes) as text and not be interpreted as expressions.