summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@digia.com>2013-03-08 15:52:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-14 16:17:22 +0100
commit958b621ba2f13535cd6873ceeaee096c13737549 (patch)
tree6d987ae46d2635e4b19a8b49b9faaa9521a83f09 /src/corelib
parentc7191d3e214b9cdb17ec383b61f7e21e784f80d0 (diff)
Correct QDate and QTime documentation.
Task-number: QTBUG-30055 Change-Id: I94c8e023f5e3d23ff2f1c74d0763b1c825deb3d1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qdatetime.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index bf3cc68c06..86a6a020cd 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -265,8 +265,7 @@ static QString fmtDateTime(const QString& f, const QTime* dt = 0, const QDate* d
If the specified date is invalid, the date is not set and
isValid() returns false.
- \warning Years 0 to 99 are interpreted as is, i.e., years
- 0-99.
+ \warning Years 1 to 99 are interpreted as is. Year 0 is invalid.
\sa isValid()
*/
@@ -1488,10 +1487,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
- 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.)
+ which is also HH:MM:SS.
If the \a format is Qt::SystemLocaleShortDate or
Qt::SystemLocaleLongDate, the string format depends on the locale