summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers/sqlite
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-07-07 10:05:36 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-07 10:05:36 (GMT)
commitd7557de99b38031906c17c54496cb76a13dec5f7 (patch)
tree975c545f8c19edb5d7ccc84c7444db7d9b1da9ac /src/plugins/sqldrivers/sqlite
parent42fe2bfb65c85fc630efe32aa1d62d66f2caab2a (diff)
downloadQt-d7557de99b38031906c17c54496cb76a13dec5f7.zip
Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.gz
Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.bz2
Consolidate sql driver configuration redundancy
Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/sqldrivers/sqlite')
-rw-r--r--src/plugins/sqldrivers/sqlite/sqlite.pro15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
index 75f04b9..f4c1671 100644
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ b/src/plugins/sqldrivers/sqlite/sqlite.pro
@@ -1,18 +1,7 @@
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