Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 142
Merged at revision: 142
Proposed branch: lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src
Diff against target: 59 lines (+39/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch (+31/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_rfc2822_dateformat
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+213977@code.launchpad.net

Commit message

* debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
  - Support RFC 2822 format (LP: #1298978)

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-03 05:54:03 +0000
3+++ debian/changelog 2014-04-03 08:41:20 +0000
4@@ -1,3 +1,10 @@
5+qtdeclarative-opensource-src (5.2.1-3ubuntu13) trusty; urgency=medium
6+
7+ * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch
8+ - Support RFC 2822 format (LP: #1298978)
9+
10+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 03 Apr 2014 05:55:24 +0000
11+
12 qtdeclarative-opensource-src (5.2.1-3ubuntu12) trusty; urgency=medium
13
14 * 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch: Call
15
16=== added file 'debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch'
17--- debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch 2014-04-03 08:41:20 +0000
19@@ -0,0 +1,31 @@
20+From 771cf807de52c8b4352eed341c3cc40c35c9b9d2 Mon Sep 17 00:00:00 2001
21+From: Timo Jyrinki <timo.jyrinki@canonical.com>
22+Date: Thu, 3 Apr 2014 05:28:38 +0000
23+Subject: [PATCH] Support RFC2822Date date format similar to V8.
24+
25+Currently a date like "Wed, 18 Sep 2013 07:00:51 -0700" cannot be parsed.
26+However, this used to work in Qt 5.0.2. This commit adds a check for
27+Qt::RFC2822Date format after the ISODate check but before the manually
28+defined QStringLiteral formats.
29+
30+Task-Number: QTBUG-38011
31+---
32+ src/qml/jsruntime/qv4dateobject.cpp | 2 ++
33+ 1 file changed, 2 insertions(+)
34+
35+diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
36+index fc94862..70bec14 100644
37+--- a/src/qml/jsruntime/qv4dateobject.cpp
38++++ b/src/qml/jsruntime/qv4dateobject.cpp
39+@@ -488,6 +488,8 @@ static inline double ParseString(const QString &s)
40+ QDateTime dt = QDateTime::fromString(s, Qt::TextDate);
41+ if (!dt.isValid())
42+ dt = QDateTime::fromString(s, Qt::ISODate);
43++ if (!dt.isValid())
44++ dt = QDateTime::fromString(s, Qt::RFC2822Date);
45+ if (!dt.isValid()) {
46+ QStringList formats;
47+ formats << QStringLiteral("M/d/yyyy")
48+--
49+1.9.0
50+
51
52=== modified file 'debian/patches/series'
53--- debian/patches/series 2014-03-27 17:10:35 +0000
54+++ debian/patches/series 2014-04-03 08:41:20 +0000
55@@ -18,3 +18,4 @@
56 V4-fix-range-sorting.patch
57 V4-regalloc-fix-interval-splitting-when-register-pre.patch
58 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch
59+Support-RFC2822Date-date-format-similar-to-V8.patch

Subscribers

People subscribed via source and target branches