diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2018-05-07 11:34:44 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2018-05-08 01:59:08 +0000 |
| commit | 8f7dcba204d21444cb0bd00f13fc496bb9420484 (patch) | |
| tree | 17b24cfe8527c2203d47a1bdd6c2827b01780c64 | |
| parent | f72777b969bd74a1472ce8f028da01a82200d656 (diff) | |
Fix build without features.timezone
Change-Id: I3f8421103afa61baf415636b4dc8cf93fb477bcc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | src/corelib/tools/qdatetimeparser.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp index 551e01e076..d03518e70d 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/tools/qdatetimeparser.cpp @@ -44,7 +44,9 @@ #include "qset.h" #include "qlocale.h" #include "qdatetime.h" +#if QT_CONFIG(timezone) #include "qtimezone.h" +#endif #include "qregexp.h" #include "qdebug.h" diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 6375825720..a862e8d2a7 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -55,7 +55,9 @@ #include <qcache.h> #include <qregularexpression.h> #endif +#if QT_CONFIG(timezone) #include <QTimeZone> +#endif #include <QScopedValueRollback> #if defined Q_OS_WIN @@ -438,8 +440,10 @@ static QString timespecToString(const QDateTime &dateTime) return QStringLiteral("Z"); case Qt::OffsetFromUTC: return secondsToOffset(dateTime.offsetFromUtc()); +#if QT_CONFIG(timezone) case Qt::TimeZone: return secondsToOffset(dateTime.timeZone().offsetFromUtc(dateTime)); +#endif default: return QString(); } |