diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
| commit | a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (patch) | |
| tree | 0bc15fb9c75bdb98ec58cb56b9cdb96f9c0e8496 /src/xmlpatterns/data/qabstractdatetime.cpp | |
| parent | 141d12bd6d8c51bc92128654a084b36c6b747120 (diff) | |
| parent | 3a44e86cdceba7acc6b830274968b0dfa482f5a8 (diff) | |
| download | qtxmlpatterns-a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iea8a806a7fe03bc52ffdae10b8459ce6cc275cc6
Diffstat (limited to 'src/xmlpatterns/data/qabstractdatetime.cpp')
| -rw-r--r-- | src/xmlpatterns/data/qabstractdatetime.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 2e084ef..c608e20 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -38,7 +38,9 @@ ****************************************************************************/ #include <QStringList> +#if QT_CONFIG(timezone) #include <QTimeZone> +#endif #include "qbuiltintypes_p.h" #include "qitem_p.h" @@ -387,11 +389,13 @@ void AbstractDateTime::copyTimeSpec(const QDateTime &from, Q_ASSERT(to.timeSpec() == Qt::OffsetFromUTC); return; } +#if QT_CONFIG(timezone) case Qt::TimeZone: { to.setTimeZone(from.timeZone()); return; } +#endif } } |