From 215145a88910b7e1446b988e0ee055f44a55f503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 23 Sep 2013 10:10:42 +0000 Subject: Update QXmlQuery test result after default date format change. QTime is not showing milliseconds by default anymore, when converted to QString. Change-Id: Iba745919ee1f034aebc75628a96efad5546f03c1 Reviewed-by: Mitch Curtis Reviewed-by: Sergio Ahumada --- tests/auto/qxmlquery/pushBaselines/allAtomics.ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qxmlquery/pushBaselines/allAtomics.ref b/tests/auto/qxmlquery/pushBaselines/allAtomics.ref index 71ecaaa..77aceaa 100644 --- a/tests/auto/qxmlquery/pushBaselines/allAtomics.ref +++ b/tests/auto/qxmlquery/pushBaselines/allAtomics.ref @@ -1,6 +1,6 @@ startOfSequence() atomicValue(xs:untypedAtomic) -atomicValue(2002-10-10T23:02:11.000Z) +atomicValue(2002-10-10T23:02:11Z) atomicValue(2002-10-10) atomicValue() atomicValue() -- cgit v1.2.1 From 6f94c6960de379d7df867019f418d3a07f73cc5b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 23 Sep 2013 07:16:05 -0700 Subject: Adapt to QDateTime's new timezone support Change-Id: I685b1be45fcf6b59de12204ca471e35a5a03f06d Reviewed-by: Mitch Curtis Reviewed-by: John Layt --- src/xmlpatterns/data/qabstractdatetime.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 2b14fd9..92d317d 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include +#include #include "qbuiltintypes_p.h" #include "qitem_p.h" @@ -388,6 +389,11 @@ void AbstractDateTime::copyTimeSpec(const QDateTime &from, Q_ASSERT(to.timeSpec() == Qt::OffsetFromUTC); return; } + case Qt::TimeZone: + { + to.setTimeZone(from.timeZone()); + return; + } } } -- cgit v1.2.1 From e7a51b138772cb453555d27f44e6a2c0e79e799c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 20 Sep 2013 15:05:49 +0200 Subject: Fix MSVC2010 warnings. Change-Id: Ic586e7d306729f26859411b17c79d36320f487e7 Reviewed-by: Friedemann Kleint --- src/xmlpatterns/data/qderivedinteger_p.h | 2 ++ src/xmlpatterns/parser/qquerytransformparser.cpp | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h index 621f061..241abac 100644 --- a/src/xmlpatterns/data/qderivedinteger_p.h +++ b/src/xmlpatterns/data/qderivedinteger_p.h @@ -393,6 +393,8 @@ namespace QPatternist * reason get a linker error with GCC. Using this temporary * variable solves it. */ const StorageType minimum = minInclusive; + // MSVC2010 complains that this is initialised but not referenced. + Q_UNUSED(minimum) if((limitsUsage & LimitUpwards) && num > maxInclusive) diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index 6b9194c..0969701 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -3368,6 +3368,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseInfo) ParserContext *const parseInfo; #endif { + YYUSE (yytype); YYUSE (yyvaluep); YYUSE (yylocationp); YYUSE (parseInfo); @@ -3375,13 +3376,6 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseInfo) if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } } -- cgit v1.2.1