diff options
| author | Mitch Curtis <mitch.curtis@nokia.com> | 2012-06-05 16:18:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 00:55:27 +0200 |
| commit | 168c583a783196181b7aa601d644459d7e0de92d (patch) | |
| tree | 35a394ddd9d4f0a619c6fdece9f9ce88c3bc8f82 /src/corelib | |
| parent | 1f461ac45bfa8887261510a95fb33a346d68eaba (diff) | |
Allow ISODate string without seconds in QTime::fromString().
According to ISO 8601 (section 4.2.2.3), seconds can be omitted
from a string representing time.
Task-number: QTBUG-2813
Change-Id: I2578f290845e46a8f49be489f1d7427984ae7f08
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index ca398170a3..021053fc6d 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -1803,6 +1803,10 @@ QTime QTime::fromString(const QString& s, Qt::DateFormat f) const int minute(s.mid(3, 2).toInt(&ok)); if (!ok) return QTime(); + if (f == Qt::ISODate && s.size() == 5) { + // Do not need to specify seconds if using ISO format. + return QTime(hour, minute, 0, 0); + } const int second(s.mid(6, 2).toInt(&ok)); if (!ok) return QTime(); |