diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-08 19:16:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-05-08 20:15:22 +0000 |
| commit | 40c83e43cc1f2dee37ac74216155e04177091b2a (patch) | |
| tree | c9ae14b5f3b8db4f838b7c72b4450b1b9af0663a /src/corelib | |
| parent | b9a578ebc604e5f919c633ec8bee99aa8d21071d (diff) | |
| parent | b5a956601f369e961d6863126f8facc61bb6df1f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qdatetimeparser.cpp | 2 |
1 files changed, 2 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" |