diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2012-02-24 14:20:24 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 20:41:44 (GMT) |
| commit | fa713e349cbc452fe52c2375a6d05f6b9a689fb7 (patch) | |
| tree | ec38ed10a106f4dde9d9a4a37dad1477340fca81 /src | |
| parent | abf19060e20b00b56812a726b1e8fa9d4c6cfd48 (diff) | |
| download | Qt-fa713e349cbc452fe52c2375a6d05f6b9a689fb7.zip Qt-fa713e349cbc452fe52c2375a6d05f6b9a689fb7.tar.gz Qt-fa713e349cbc452fe52c2375a6d05f6b9a689fb7.tar.bz2 | |
Fix static build of Qt for WinCE and WEC7.
When doing a static build of Qt for WinCE/WEC7, the sqlite database
driver is statically built into Qt library. In that case relevant
HAVE_LOCALTIME_S=0 defined in sqlite.pro under plugins folder does
not have effect because qsql_sqlite.pri and further 3rdparty/sqlite.pri
are directly included to QtSql library.
Moved the needed define down to such *.pri file which is included
in both static and non-static Qt builds.
Task-number: QTBUG-24500
Change-Id: Iacbdd6d02fc31558a1ce91f42756eaac5053414b
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/sqlite.pri | 1 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/sqlite.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 575412d..375adc3 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -1,4 +1,5 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE +wince*: DEFINES += HAVE_LOCALTIME_S=0 INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index f4c1671..11d79d6 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -3,6 +3,4 @@ TARGET = qsqlite SOURCES = smain.cpp include(../../../sql/drivers/sqlite/qsql_sqlite.pri) -wince*: DEFINES += HAVE_LOCALTIME_S=0 - include(../qsqldriverbase.pri) |