diff options
author | Liang Qi <liang.qi@qt.io> | 2018-05-08 20:43:45 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-05-08 20:43:45 +0200 |
commit | b5a956601f369e961d6863126f8facc61bb6df1f (patch) | |
tree | 25e4021518b254ef76c410244dd6581432bf285f /src/plugins/sqldrivers | |
parent | 290f953253afc5935382525cd4b72e091865cab5 (diff) | |
parent | 1b7337d23dbc767ba482d9051180f10d77052913 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro
Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 5f627558ac..5b0800ae50 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -55,7 +55,6 @@ #include <qcache.h> #include <qregularexpression.h> #endif -#include <QTimeZone> #include <QScopedValueRollback> #if defined Q_OS_WIN |