From 168c583a783196181b7aa601d644459d7e0de92d Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 5 Jun 2012 16:18:59 +0200 Subject: 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 --- src/corelib/tools/qdatetime.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/corelib/tools') 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(); -- cgit v1.2.3