Commit 7bdbdd3c authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

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: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 0cab9637

package/qt/Config.sql.in

+21 −9
Original line number Diff line number Diff line
@@ -34,16 +34,28 @@ config BR2_PACKAGE_QT_PSQL 
	  Build PostgreSQL driver

	  If unsure, say n.



config BR2_PACKAGE_QT_SQLITE

	bool "SQLite 3 Driver"

choice

	prompt "SQLite 3 support"

	default BR2_PACKAGE_QT_SQLITE_NONE

	help

	  Build SQLite driver

	  If unsure, say n.

	  Select SQLite support.



config BR2_PACKAGE_QT_SQLITE2

	bool "SQLite 2 Driver"

	depends on BROKEN # sqlite2 not in BR

config BR2_PACKAGE_QT_SQLITE_NONE

	bool "No sqlite support"

	help

	  Build SQLite 2 driver

	  If unsure, say n.

	  Do not compile any kind of SQLite support.



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

package/qt/qt.mk

+6 −1
Original line number Diff line number Diff line
@@ -295,11 +295,16 @@ endif 
ifeq ($(BR2_PACKAGE_QT_PSQL),y)

QT_CONFIGURE+= -qt-sql-psql

endif

ifeq ($(BR2_PACKAGE_QT_SQLITE),y)

ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)

QT_CONFIGURE+= -qt-sql-sqlite

else

ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)

QT_CONFIGURE+= -system-sqlite

QT_DEP_LIBS+= sqlite

else

QT_CONFIGURE+= -no-sql-sqlite

endif

endif

ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)

QT_CONFIGURE+= -qt-sql-sqlite2

endif