summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-23 07:16:05 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-23 18:29:47 +0200
commit6f94c6960de379d7df867019f418d3a07f73cc5b (patch)
tree2211b149107fb2696fd1f2778cae2a39ca93f2d1
parent215145a88910b7e1446b988e0ee055f44a55f503 (diff)
downloadqtxmlpatterns-6f94c6960de379d7df867019f418d3a07f73cc5b.tar.gz
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>
-rw-r--r--src/xmlpatterns/data/qabstractdatetime.cpp6
1 files changed, 6 insertions, 0 deletions
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 <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;
+ }
}
}