diff options
| author | Mitch Curtis <mitch.curtis@nokia.com> | 2012-06-04 16:59:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 06:12:37 +0200 |
| commit | d8e457323c2d2ef72ab81838ba82300672e4e26e (patch) | |
| tree | 17ab60a827fcd059ffb2ef689b34bf8511ade217 /src | |
| parent | 1668c47608dc2b83c62ef76e97361b11b35a92a7 (diff) | |
Allow 24:00:00 for ISO dates in QDateTime::fromString().
ISO 8601 section 4.2.3 states that "The end of one calendar day [24:00]
coincides with [00:00] at the start of the next calendar day", so
fromString() was updated to account for this.
Task-number: QTBUG-25387
Change-Id: I391db0da755dbc822ba0820c302a2c10391e1f3b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 630deccadd..ca398170a3 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -3206,7 +3206,7 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f) case Qt::ISODate: { QString tmp = s; Qt::TimeSpec ts = Qt::LocalTime; - const QDate date = QDate::fromString(tmp.left(10), Qt::ISODate); + QDate date = QDate::fromString(tmp.left(10), Qt::ISODate); if (tmp.size() == 10) return QDateTime(date); @@ -3240,7 +3240,15 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f) return dt; } } - return QDateTime(date, QTime::fromString(tmp, Qt::ISODate), ts); + + QTime time(QTime::fromString(tmp, Qt::ISODate)); + if (!time.isValid() && tmp == QString::fromLatin1("24:00:00")) { + // ISO 8601 (section 4.2.3) says that 24:00 is equivalent to 00:00 the next day. + date = date.addDays(1); + // Don't need to correct time since QDateTime constructor will do it for us. + } + + return QDateTime(date, time, ts); } case Qt::SystemLocaleDate: case Qt::SystemLocaleShortDate: |