diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:45:36 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:47:02 (GMT) |
| commit | 47ec2fd2193f56e02a402df4d0fa9f1b521d07fc (patch) | |
| tree | d4d0af46486c486b25253fde8d4550844dc66dd3 /src/corelib/tools/qdatetime.cpp | |
| parent | 274619e086e6e9ebba6c383ffb837dc140c840e7 (diff) | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| download | Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.zip Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.gz Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.bz2 | |
Merge branch 4.8 into qt-4.8-from-4.7
Conflicts:
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index e33b7d5..e1b4232 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -1538,7 +1538,7 @@ int QTime::msec() const If \a format is Qt::ISODate, the string format corresponds to the ISO 8601 extended specification for representations of dates, - which is also HH:MM:SS. (However, contrary to ISO 8601, dates + which is also HH:mm:ss. (However, contrary to ISO 8601, dates before 15 October 1582 are handled as Julian dates, not Gregorian dates. See \l{QDate G and J} {Use of Gregorian and Julian Calendars}. This might change in a future version of Qt.) @@ -2461,7 +2461,7 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC) If the \a format is Qt::ISODate, the string format corresponds to the ISO 8601 extended specification for representations of - dates and times, taking the form YYYY-MM-DDTHH:MM:SS[Z|[+|-]HH:MM], + dates and times, taking the form YYYY-MM-DDTHH:mm:ss[Z|[+|-]HH:mm], depending on the timeSpec() of the QDateTime. If the timeSpec() is Qt::UTC, Z will be appended to the string; if the timeSpec() is Qt::OffsetFromUTC the offset in hours and minutes from UTC will |