diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 13:06:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 13:06:23 (GMT) |
| commit | 1f88e7df38aa890cf893cf7f5b60546dbd922bdf (patch) | |
| tree | ed0d36781e8fa36cd62dd90b284e14d6f611af17 /src/plugins | |
| parent | afd6dbb4f0cdf5ea5b008351537c5d377af89c91 (diff) | |
| parent | 4a0b21f43a2ce59c4fa4a79fe33fa7f19822eb04 (diff) | |
| download | Qt-1f88e7df38aa890cf893cf7f5b60546dbd922bdf.zip Qt-1f88e7df38aa890cf893cf7f5b60546dbd922bdf.tar.gz Qt-1f88e7df38aa890cf893cf7f5b60546dbd922bdf.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
compile fix for plugins\sqldrivers\sqlite on WinCE 6
fix menu handling on Windows CE
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/sqlite.pro | 2 |
1 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) |