summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qdatetime.cpp4
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();