summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
committeraavit <qt-info@nokia.com>2011-09-10 14:43:04 (GMT)
commitb318fc0800c3081af16a38614b95dd50a82b6bbb (patch)
tree9057e35b5d03ce2b223167b5bc98af681fcb0065 /src/corelib/global
parente78edf97db002d5d8efcfd0c2df283f980d3a432 (diff)
parent2fafbf51d6cd61d073c9f77dffd71864e9686de6 (diff)
downloadQt-b318fc0800c3081af16a38614b95dd50a82b6bbb.zip
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.gz
Qt-b318fc0800c3081af16a38614b95dd50a82b6bbb.tar.bz2
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index dc92866..4974aef 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -539,7 +539,7 @@
string, "ddd MMM d yyyy". See QDate::toString() for more information.
\value ISODate \l{ISO 8601} extended format: either \c{YYYY-MM-DD} for dates or
- \c{YYYY-MM-DDTHH:MM:SS}, \c{YYYY-MM-DDTHH:MM:SSTZD} (e.g., 1997-07-16T19:20:30+01:00)
+ \c{YYYY-MM-DDTHH:mm:ss}, \c{YYYY-MM-DDTHH:mm:ssTZD} (e.g., 1997-07-16T19:20:30+01:00)
for combined dates and times.
\value SystemLocaleShortDate The \l{QLocale::ShortFormat}{short format} used