Skip to contentSkip to conversation

qt5: mysql and sqlite plugins

PATCH New Wojciech Slenska 3 participants 5 messages May 23, 2013 – May 30, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5: mysql and sqlite plugins

Added support for mysql and sqlite plugins. Configuration is based on qt package.

---
 package/qt5/qt5base/Config.in  | 36 ++++++++++++++++++++++++++++++++++++
 package/qt5/qt5base/qt5base.mk | 11 +++++++++++
 2 files changed, 47 insertions(+)
package/qt5/qt5base/Config.in +36 -0
index 7974357..9c7fd15 100644
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
 	help
 	  This options enables the Qt5Sql library.
 
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+	bool "MySQL Plugin"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	depends on BR2_USE_MMU # mysql
+	help
+	  Build MySQL plugin
+	  If unsure, say n.
+choice
+	prompt "SQLite 3 support"
+	default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	help
+	  Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	bool "No sqlite support"
+	help
+	  Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+	bool "Qt SQLite"
+	help
+	  Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+	bool "System SQLite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Use system SQLite.
+
+endchoice
+
+endif
+
 config BR2_PACKAGE_QT5BASE_TEST
 	bool "test module"
 	help
package/qt5/qt5base/qt5base.mk +11 -0
index bfc6c91..5b0596d 100644
@@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO
 endif
 
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql) 
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
+
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite) 
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
 # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
 # is to add a link against the "inuxfb" library.
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 qt5: mysql and sqlite plugins

Quoted 3 lines · Wojciech Slenska

Added support for mysql and sqlite plugins. Configuration is based on qt package.

(untested)

One minor comment below.

Quoted 57 lines
---
  package/qt5/qt5base/Config.in  | 36 ++++++++++++++++++++++++++++++++++++
  package/qt5/qt5base/qt5base.mk | 11 +++++++++++
  2 files changed, 47 insertions(+)
package/qt5/qt5base/Config.in +36 -0
index 7974357..9c7fd15 100644
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
  	help
  	  This options enables the Qt5Sql library.
 
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+	bool "MySQL Plugin"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	depends on BR2_USE_MMU # mysql
+	help
+	  Build MySQL plugin
+	  If unsure, say n.
+choice
+	prompt "SQLite 3 support"
+	default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	help
+	  Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	bool "No sqlite support"
+	help
+	  Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+	bool "Qt SQLite"
+	help
+	  Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+	bool "System SQLite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Use system SQLite.
+
+endchoice
+
+endif
+
  config BR2_PACKAGE_QT5BASE_TEST
  	bool "test module"
  	help
package/qt5/qt5base/qt5base.mk +0 -0
index bfc6c91..5b0596d 100644

package/qt5/qt5base/qt5base.mk QT5BASE_LICENSE = Commercial license · line 65

Quoted 6 lines
package/qt5/qt5base/qt5base.mk +3 -0
@@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
  QT5BASE_REDISTRIBUTE = NO
  endif
 
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql)

Please split this long line. Actually, an ifeq - else construct seems
more appropriate in this case.

Regards,
Arnout

Quoted 12 lines
package/qt5/qt5base/qt5base.mk +8 -0
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
+
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
  # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
  # is to add a link against the "inuxfb" library.
  QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 qt5: mysql and sqlite plugins

Hello Arnout,

Thanks for Your comment. I will change this long line to if - else construction.

Best Regards
Wojciech

2013/5/27 Arnout Vandecappelle <[email protected]>:

Quoted 114 lines · Wojciech Slenska
Quoted 5 lines

Added support for mysql and sqlite plugins. Configuration is based on qt package.

(untested)

One minor comment below.

Quoted 64 lines
---
  package/qt5/qt5base/Config.in  | 36 ++++++++++++++++++++++++++++++++++++
  package/qt5/qt5base/qt5base.mk | 11 +++++++++++
  2 files changed, 47 insertions(+)
package/qt5/qt5base/Config.in +36 -0
index 7974357..9c7fd15 100644
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
        help
          This options enables the Qt5Sql library.
 
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+       bool "MySQL Plugin"
+       select BR2_PACKAGE_MYSQL_CLIENT
+       select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_READLINE
+       depends on BR2_USE_MMU # mysql
+       help
+         Build MySQL plugin
+         If unsure, say n.
+choice
+       prompt "SQLite 3 support"
+       default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+       help
+         Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+       bool "No sqlite support"
+       help
+         Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+       bool "Qt SQLite"
+       help
+         Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+       bool "System SQLite"
+       select BR2_PACKAGE_SQLITE
+       help
+         Use system SQLite.
+
+endchoice
+
+endif
+
  config BR2_PACKAGE_QT5BASE_TEST
        bool "test module"
        help
package/qt5/qt5base/qt5base.mk +3 -0
index bfc6c91..5b0596d 100644
@@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
  QT5BASE_REDISTRIBUTE = NO
  endif
 
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+QT5BASE_CONFIGURE_OPTS += $(if
Quoted 2 lines

$(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql)

Please split this long line. Actually, an ifeq - else construct seems more
appropriate in this case.

Regards,
Arnout

Quoted 11 lines
package/qt5/qt5base/qt5base.mk +3 -0
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
+
+QT5BASE_CONFIGURE_OPTS += $(if

$(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
+QT5BASE_DEPENDENCIES += $(if
$(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)

package/qt5/qt5base/qt5base.mk QT5BASE_LICENSE = Commercial license · line 76

Quoted 5 lines
package/qt5/qt5base/qt5base.mk +2 -0
+endif
+
  # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
  # is to add a link against the "inuxfb" library.
  QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)

--

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#3 lore raw

PATCH v2 1/1 qt5: mysql and sqlite plugins

Added support for mysql and sqlite plugins. Configuration is based on qt package.

---
 package/qt5/qt5base/Config.in  | 36 ++++++++++++++++++++++++++++++++++++
 package/qt5/qt5base/qt5base.mk | 15 +++++++++++++++
 2 files changed, 51 insertions(+)
package/qt5/qt5base/Config.in +36 -0
index 7974357..9c7fd15 100644
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
 	help
 	  This options enables the Qt5Sql library.
 
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+	bool "MySQL Plugin"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
+	depends on BR2_USE_MMU # mysql
+	help
+	  Build MySQL plugin
+	  If unsure, say n.
+choice
+	prompt "SQLite 3 support"
+	default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	help
+	  Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+	bool "No sqlite support"
+	help
+	  Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+	bool "Qt SQLite"
+	help
+	  Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+	bool "System SQLite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Use system SQLite.
+
+endchoice
+
+endif
+
 config BR2_PACKAGE_QT5BASE_TEST
 	bool "test module"
 	help
package/qt5/qt5base/qt5base.mk +15 -0
index bfc6c91..1eea2e7 100644
@@ -60,6 +60,21 @@ QT5BASE_LICENSE = Commercial license
 QT5BASE_REDISTRIBUTE = NO
 endif
 
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
+QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
+QT5BASE_DEPENDENCIES   += mysql_client
+else
+QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
+endif
+
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) 
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite) 
+QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
 # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
 # is to add a link against the "inuxfb" library.
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH v2 1/1 qt5: mysql and sqlite plugins

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Wojciech" == Wojciech Slenska <[email protected]> writes:

Wojciech> Added support for mysql and sqlite plugins. Configuration is Wojciech> based on qt package.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard