From 6f94c6960de379d7df867019f418d3a07f73cc5b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 23 Sep 2013 07:16:05 -0700
Subject: [PATCH] Adapt to QDateTime's new timezone support
Change-Id: I685b1be45fcf6b59de12204ca471e35a5a03f06d
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
---
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 2b14fd95..92d317dd 100644
--- a/src/xmlpatterns/data/qabstractdatetime.cpp
+++ b/src/xmlpatterns/data/qabstractdatetime.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
#include <QStringList>
+#include <QTimeZone>
#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;
+ }
}
}
--
GitLab