diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2015-01-05 14:44:36 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-01-08 10:03:02 +0100 |
| commit | 5cfe7d2074306a72909ea20718c1c4bebeb27bad (patch) | |
| tree | 263d1b8622de95fe040fa29e55af2e3631a3c959 /src | |
| parent | 3c842d675faf7fd063c000db2a90fe01b41576e8 (diff) | |
Parse dates as Qt::RFC2822Date too
[ChangeLog][QtQml] Fix JavaScript Date parsing to correctly accept RC2822 dates.
Task-number: QTBUG-38011
Change-Id: Ic7d3f5b8c624d6780d4c3595fd2efe22c427ffd3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index e00a705700..b3c340ccb2 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -480,6 +480,8 @@ static inline double ParseString(const QString &s) QDateTime dt = QDateTime::fromString(s, Qt::TextDate); if (!dt.isValid()) dt = QDateTime::fromString(s, Qt::ISODate); + if (!dt.isValid()) + dt = QDateTime::fromString(s, Qt::RFC2822Date); if (!dt.isValid()) { QStringList formats; formats << QStringLiteral("M/d/yyyy") |