qt: add option for system sqlite

Add an option to use the system sqlite library.
Also drop sqlite2 stub since it's pointless.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2011-03-01 11:34:00 -03:00 committed by Peter Korsgaard
parent 0cab963761
commit 7bdbdd3c38
2 changed files with 27 additions and 10 deletions

View File

@ -34,16 +34,28 @@ config BR2_PACKAGE_QT_PSQL
Build PostgreSQL driver Build PostgreSQL driver
If unsure, say n. If unsure, say n.
config BR2_PACKAGE_QT_SQLITE choice
bool "SQLite 3 Driver" prompt "SQLite 3 support"
default BR2_PACKAGE_QT_SQLITE_NONE
help help
Build SQLite driver Select SQLite support.
If unsure, say n.
config BR2_PACKAGE_QT_SQLITE2 config BR2_PACKAGE_QT_SQLITE_NONE
bool "SQLite 2 Driver" bool "No sqlite support"
depends on BROKEN # sqlite2 not in BR
help help
Build SQLite 2 driver Do not compile any kind of SQLite support.
If unsure, say n.
config BR2_PACKAGE_QT_SQLITE_QT
bool "Qt SQLite"
help
Use Qt bundled SQLite support.
config BR2_PACKAGE_QT_SQLITE_SYSTEM
bool "System SQLite"
select BR2_PACKAGE_SQLITE
help
Use system SQLite.
endchoice
endif endif

View File

@ -295,11 +295,16 @@ endif
ifeq ($(BR2_PACKAGE_QT_PSQL),y) ifeq ($(BR2_PACKAGE_QT_PSQL),y)
QT_CONFIGURE+= -qt-sql-psql QT_CONFIGURE+= -qt-sql-psql
endif endif
ifeq ($(BR2_PACKAGE_QT_SQLITE),y) ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
QT_CONFIGURE+= -qt-sql-sqlite QT_CONFIGURE+= -qt-sql-sqlite
else else
ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
QT_CONFIGURE+= -system-sqlite
QT_DEP_LIBS+= sqlite
else
QT_CONFIGURE+= -no-sql-sqlite QT_CONFIGURE+= -no-sql-sqlite
endif endif
endif
ifeq ($(BR2_PACKAGE_QT_SQLITE2),y) ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
QT_CONFIGURE+= -qt-sql-sqlite2 QT_CONFIGURE+= -qt-sql-sqlite2
endif endif