1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn the available sql drivers into public features

Browse Source 
This is required to do the modularization of those
features properly.

Change-Id: I384aff20274e795aa70483980f0ef25309328800
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-09-08 11:31:46 +02:00
parent e776031281
commit 137e690ac7
3 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
configure.json
View File

@ -165,24 +165,24 @@
"skip": "addString", "skip": "addString",
"slog2": "boolean", "slog2": "boolean",
"sm": { "type": "boolean", "name": "sessionmanager" }, "sm": { "type": "boolean", "name": "sessionmanager" },
"sql-db2": { "type": "boolean", "name": "db2" }, "sql-db2": "boolean",
"sql-ibase": { "type": "boolean", "name": "ibase" }, "sql-ibase": "boolean",
"sql-mysql": { "type": "boolean", "name": "mysql" }, "sql-mysql": "boolean",
"sql-oci": { "type": "boolean", "name": "oci" }, "sql-oci": "boolean",
"sql-odbc": { "type": "boolean", "name": "odbc" }, "sql-odbc": "boolean",
"sql-psql": { "type": "boolean", "name": "psql" }, "sql-psql": "boolean",
"sql-sqlite": { "type": "boolean", "name": "sqlite" }, "sql-sqlite": "boolean",
"sql-sqlite2": { "type": "boolean", "name": "sqlite2" }, "sql-sqlite2": "boolean",
"sql-tds": { "type": "boolean", "name": "tds" }, "sql-tds": "boolean",
"plugin-sql-db2": { "type": "void", "name": "db2" }, "plugin-sql-db2": { "type": "void", "name": "sql-db2" },
"plugin-sql-ibase": { "type": "void", "name": "ibase" }, "plugin-sql-ibase": { "type": "void", "name": "sql-ibase" },
"plugin-sql-mysql": { "type": "void", "name": "mysql" }, "plugin-sql-mysql": { "type": "void", "name": "sql-mysql" },
"plugin-sql-oci": { "type": "void", "name": "oci" }, "plugin-sql-oci": { "type": "void", "name": "sql-oci" },
"plugin-sql-odbc": { "type": "void", "name": "odbc" }, "plugin-sql-odbc": { "type": "void", "name": "sql-odbc" },
"plugin-sql-psql": { "type": "void", "name": "psql" }, "plugin-sql-psql": { "type": "void", "name": "sql-psql" },
"plugin-sql-sqlite": { "type": "void", "name": "sqlite" }, "plugin-sql-sqlite": { "type": "void", "name": "sql-sqlite" },
"plugin-sql-sqlite2": { "type": "void", "name": "sqlite2" }, "plugin-sql-sqlite2": { "type": "void", "name": "sql-sqlite2" },
"plugin-sql-tds": { "type": "void", "name": "tds" }, "plugin-sql-tds": { "type": "void", "name": "sql-tds" },
"qdbus": { "type": "boolean", "name": "dbus" }, "qdbus": { "type": "boolean", "name": "dbus" },
"sqlite": { "type": "enum", "name": "system-sqlite", "values": { "qt": "no", "system": "yes" } }, "sqlite": { "type": "enum", "name": "system-sqlite", "values": { "qt": "no", "system": "yes" } },
"sse2": "boolean", "sse2": "boolean",
@ -2355,60 +2355,60 @@
"condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2", "condition": "features.opengl-desktop || features.opengl-dynamic || features.opengles2",
"output": [ "publicFeature", "feature" ] "output": [ "publicFeature", "feature" ]
}, },
"db2": { "sql-db2": {
"description": "DB2 (IBM)", "description": "DB2 (IBM)",
"condition": "libs.db2", "condition": "libs.db2",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"ibase": { "sql-ibase": {
"description": "InterBase", "description": "InterBase",
"condition": "libs.ibase", "condition": "libs.ibase",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"mysql": { "sql-mysql": {
"description": "MySql", "description": "MySql",
"condition": "libs.mysql", "condition": "libs.mysql",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"use_libmysqlclient_r": { "use_libmysqlclient_r": {
"description": "MySql (threadsafe)", "description": "MySql (threadsafe)",
"condition": "features.mysql && (libs.mysql.source == 0 || libs.mysql.source == 2)", "condition": "features.sql-mysql && (libs.mysql.source == 0 || libs.mysql.source == 2)",
"output": [ "privateConfig" ] "output": [ "privateConfig" ]
}, },
"oci": { "sql-oci": {
"description": "OCI (Oracle)", "description": "OCI (Oracle)",
"condition": "libs.oci", "condition": "libs.oci",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"odbc": { "sql-odbc": {
"description": "ODBC", "description": "ODBC",
"condition": "libs.odbc", "condition": "libs.odbc",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"psql": { "sql-psql": {
"description": "PostgreSQL", "description": "PostgreSQL",
"condition": "libs.psql", "condition": "libs.psql",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"sqlite2": { "sql-sqlite2": {
"description": "SQLite2", "description": "SQLite2",
"condition": "libs.sqlite2", "condition": "libs.sqlite2",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"sqlite": { "sql-sqlite": {
"description": "SQLite", "description": "SQLite",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"system-sqlite": { "system-sqlite": {
"description": " Using system provided SQLite", "description": " Using system provided SQLite",
"autoDetect": false, "autoDetect": false,
"condition": "features.sqlite && libs.sqlite3", "condition": "features.sql-sqlite && libs.sqlite3",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"tds": { "sql-tds": {
"description": "TDS (Sybase)", "description": "TDS (Sybase)",
"condition": "libs.tds", "condition": "libs.tds",
"output": [ "sqldriver" ] "output": [ "publicFeature" ]
}, },
"style-fusion": { "style-fusion": {
"description": "Fusion Style", "description": "Fusion Style",
@ -2579,7 +2579,7 @@ or are able to read the logged output from journald, syslog or slog2."
}, },
{ {
"type": "warning", "type": "warning",
"condition": "config.win32 && !config.msvc && features.oci", "condition": "config.win32 && !config.msvc && features.sql-oci",
"message": "Qt does not support compiling the Oracle database driver with "message": "Qt does not support compiling the Oracle database driver with
MinGW, due to lack of such support from Oracle. Consider disabling the MinGW, due to lack of such support from Oracle. Consider disabling the
Oracle driver, as the current build will most likely fail." Oracle driver, as the current build will most likely fail."
@ -2862,7 +2862,8 @@ Please apply the patch corresponding to your Standard Library vendor, found in
{ {
"section": "SQL drivers", "section": "SQL drivers",
"entries": [ "entries": [
"db2", "ibase", "mysql", "oci", "odbc", "psql", "sqlite2", "sqlite", "system-sqlite", "tds" "sql-db2", "sql-ibase", "sql-mysql", "sql-oci", "sql-odbc", "sql-psql",
"sql-sqlite2", "sql-sqlite", "system-sqlite", "sql-tds"
] ]
}, },
"tslib", "tslib",

4
configure.pri
View File

@ -508,10 +508,6 @@ defineTest(qtConfOutput_styles) {
qtConfOutputVar(append, "privatePro", "styles", $$style) qtConfOutputVar(append, "privatePro", "styles", $$style)
} }
defineTest(qtConfOutput_sqldriver) {
$${2}: qtConfOutputVar(append, "privatePro", "sql-drivers", $$eval($${1}.feature))
}
defineTest(qtConfOutput_qreal) { defineTest(qtConfOutput_qreal) {
qreal = $$config.input.qreal qreal = $$config.input.qreal
isEmpty(qreal): qreal = "double" isEmpty(qreal): qreal = "double"

18
src/plugins/sqldrivers/sqldrivers.pro
View File

@ -1,11 +1,11 @@
TEMPLATE = subdirs TEMPLATE = subdirs
contains(sql-drivers, psql) : SUBDIRS += psql qtConfig(sql-psql) : SUBDIRS += psql
contains(sql-drivers, mysql) : SUBDIRS += mysql qtConfig(sql-mysql) : SUBDIRS += mysql
contains(sql-drivers, odbc) : SUBDIRS += odbc qtConfig(sql-odbc) : SUBDIRS += odbc
contains(sql-drivers, tds) : SUBDIRS += tds qtConfig(sql-tds) : SUBDIRS += tds
contains(sql-drivers, oci) : SUBDIRS += oci qtConfig(sql-oci) : SUBDIRS += oci
contains(sql-drivers, db2) : SUBDIRS += db2 qtConfig(sql-db2) : SUBDIRS += db2
contains(sql-drivers, sqlite) : SUBDIRS += sqlite qtConfig(sql-sqlite) : SUBDIRS += sqlite
contains(sql-drivers, sqlite2) : SUBDIRS += sqlite2 qtConfig(sql-sqlite2) : SUBDIRS += sqlite2
contains(sql-drivers, ibase) : SUBDIRS += ibase qtConfig(sql-ibase) : SUBDIRS += ibase