diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 12:11:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-15 12:11:08 (GMT) |
| commit | 90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475 (patch) | |
| tree | a519424035cdbd92d665c748ffa6ecfa8d553f3b /src/plugins/sqldrivers | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | 02d1a0422c42889813bb2586503aff43a3509e09 (diff) | |
| download | Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.zip Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.tar.gz Qt-90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/gui/styles/qs60style_s60.cpp
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/sqlite.pro | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip | bin | 3155605 -> 3119273 bytes |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index c609a9e..fb31233 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -14,4 +14,6 @@ SOURCES = smain.cpp \ QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE } +wince*: DEFINES += HAVE_LOCALTIME_S=0 + include(../qsqldriverbase.pri) diff --git a/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip b/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip Binary files differindex 923cca4..df78644 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip +++ b/src/plugins/sqldrivers/sqlite_symbian/SQLite3_v9.2.zip |