Zoltan Balogh has proposed merging lp:~bzoltan/kubuntu-packaging/Revert_the_Support-RFC2822Date-date-format-similar-to-V8 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
Commit message: Revert the Support-RFC2822Date-date-format-similar-to-V8.patch as it is not integrated to the upstream 5.3 release Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~bzoltan/kubuntu-packaging/Revert_the_Support-RFC2822Date-date-format-similar-to-V8/+merge/225611 Revert the Support-RFC2822Date-date-format-similar-to-V8.patch as it is not integrated to the upstream 5.3 release -- https://code.launchpad.net/~bzoltan/kubuntu-packaging/Revert_the_Support-RFC2822Date-date-format-similar-to-V8/+merge/225611 Your team Kubuntu Packagers is requested to review the proposed merge of lp:~bzoltan/kubuntu-packaging/Revert_the_Support-RFC2822Date-date-format-similar-to-V8 into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== added file 'debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch' --- debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch 2014-07-04 08:13:57 +0000 @@ -0,0 +1,31 @@ +From 771cf807de52c8b4352eed341c3cc40c35c9b9d2 Mon Sep 17 00:00:00 2001 +From: Timo Jyrinki <[email protected]> +Date: Thu, 3 Apr 2014 05:28:38 +0000 +Subject: [PATCH] Support RFC2822Date date format similar to V8. + +Currently a date like "Wed, 18 Sep 2013 07:00:51 -0700" cannot be parsed. +However, this used to work in Qt 5.0.2. This commit adds a check for +Qt::RFC2822Date format after the ISODate check but before the manually +defined QStringLiteral formats. + +Task-Number: QTBUG-38011 +--- + src/qml/jsruntime/qv4dateobject.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp +index fc94862..70bec14 100644 +--- a/src/qml/jsruntime/qv4dateobject.cpp ++++ b/src/qml/jsruntime/qv4dateobject.cpp +@@ -488,6 +488,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") +-- +1.9.0 + === modified file 'debian/patches/series' --- debian/patches/series 2014-07-01 13:58:25 +0000 +++ debian/patches/series 2014-07-04 08:13:57 +0000 @@ -7,3 +7,4 @@ fix_qqmlobjectcreator.patch Implement-proper-support-for-layoutChange-in-QQmlDel.patch parenttosubcreator_qqmlobjectcreator.patch +Support-RFC2822Date-date-format-similar-to-V8.patch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
