diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-09 01:01:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-09 01:01:34 +0200 |
| commit | 1b71204d81ec2f1ea4a577f8eddc1cad6613895c (patch) | |
| tree | 99fb5c9400e99cff1193671bc5858669830d504d /src/qml/jsruntime | |
| parent | f7b17eed645639a4586402ecbf7d3cdf50a67706 (diff) | |
| parent | a02b5d48cf63228ed8faf6abf4724df2c4500269 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68014bc552793b6dea930744325876a8863aaef3
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 5616b1450b..520b715189 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -601,8 +601,7 @@ static inline double ParseString(const QString &s, double localTZA) QStringLiteral("d MMMM, yyyy hh:mm:ss"), }; - for (uint i = 0; i < sizeof(formats) / sizeof(formats[0]); ++i) { - const QString &format(formats[i]); + for (const QString &format : formats) { dt = format.indexOf(QLatin1String("hh:mm")) < 0 ? QDateTime(QDate::fromString(s, format), QTime(0, 0, 0), Qt::UTC) |