diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
commit | 423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch) | |
tree | 35e27c69dee1d96775f4a921e93f5cd2e574a834 /src/plugins/sqldrivers/sqlite/sqlite.pro | |
parent | a9b6c59857c28f48e093abccaf9a89755b0995bc (diff) | |
parent | 444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff) | |
download | Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2 |
Merge branch '4.7' of ../oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/sqldrivers/sqlite/sqlite.pro')
-rw-r--r-- | src/plugins/sqldrivers/sqlite/sqlite.pro | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index fb31233..f4c1671 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -1,18 +1,7 @@ -TARGET = qsqlite +TARGET = qsqlite -HEADERS = ../../../sql/drivers/sqlite/qsql_sqlite.h -SOURCES = smain.cpp \ - ../../../sql/drivers/sqlite/qsql_sqlite.cpp - -!system-sqlite:!contains( LIBS, .*sqlite.* ) { - CONFIG(release, debug|release):DEFINES *= NDEBUG - DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE - INCLUDEPATH += ../../../3rdparty/sqlite - SOURCES += ../../../3rdparty/sqlite/sqlite3.c -} else { - LIBS *= $$QT_LFLAGS_SQLITE - QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE -} +SOURCES = smain.cpp +include(../../../sql/drivers/sqlite/qsql_sqlite.pri) wince*: DEFINES += HAVE_LOCALTIME_S=0 |