summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-06-16 11:18:34 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-06-18 11:46:21 +0200
commit7155e4f62060c3d9f36e748135bd57776f40b4b2 (patch)
treeb33e787588e862a240b2598a132693ed4511a292 /src/plugins/sqldrivers
parentea7d87b5b59ded22b145ecbb4dd648ecfd1abbdd (diff)
Remove old configure-related files
Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ie827562f7fd2513d59f69234d77b8b93124ea78e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r--src/plugins/sqldrivers/.prev_configure.cmake77
-rw-r--r--src/plugins/sqldrivers/configure.json201
2 files changed, 0 insertions, 278 deletions
diff --git a/src/plugins/sqldrivers/.prev_configure.cmake b/src/plugins/sqldrivers/.prev_configure.cmake
deleted file mode 100644
index d742018b9f..0000000000
--- a/src/plugins/sqldrivers/.prev_configure.cmake
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-#### Inputs
-
-# input sqlite
-set(INPUT_sqlite "undefined" CACHE STRING "")
-set_property(CACHE INPUT_sqlite PROPERTY STRINGS undefined qt system)
-
-
-
-#### Libraries
-
-qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2 MODULE_NAME sqldrivers QMAKE_LIB db2)
-qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL MODULE_NAME sqldrivers QMAKE_LIB mysql)
-qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME sqldrivers QMAKE_LIB psql)
-qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci)
-qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
-qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
-if(NOT WIN32 AND QT_FEATURE_system_zlib)
- qt_add_qmake_lib_dependency(sqlite3 zlib)
-endif()
-
-
-#### Tests
-
-
-
-#### Features
-
-qt_feature("sql-db2" PRIVATE
- LABEL "DB2 (IBM)"
- CONDITION DB2_FOUND
-)
-qt_feature("sql-ibase" PRIVATE
- LABEL "InterBase"
- CONDITION libs.ibase OR FIXME
-)
-qt_feature("sql-mysql" PRIVATE
- LABEL "MySql"
- CONDITION MySQL_FOUND
-)
-qt_feature("sql-oci" PRIVATE
- LABEL "OCI (Oracle)"
- CONDITION Oracle_FOUND
-)
-qt_feature("sql-odbc" PRIVATE
- LABEL "ODBC"
- CONDITION QT_FEATURE_datestring AND ODBC_FOUND
-)
-qt_feature("sql-psql" PRIVATE
- LABEL "PostgreSQL"
- CONDITION PostgreSQL_FOUND
-)
-qt_feature("sql-sqlite" PRIVATE
- LABEL "SQLite"
- CONDITION QT_FEATURE_datestring
-)
-qt_feature("system-sqlite" PRIVATE
- LABEL " Using system provided SQLite"
- AUTODETECT OFF
- CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND
-)
-qt_configure_add_summary_section(NAME "Qt Sql Drivers")
-qt_configure_add_summary_entry(ARGS "sql-db2")
-qt_configure_add_summary_entry(ARGS "sql-ibase")
-qt_configure_add_summary_entry(ARGS "sql-mysql")
-qt_configure_add_summary_entry(ARGS "sql-oci")
-qt_configure_add_summary_entry(ARGS "sql-odbc")
-qt_configure_add_summary_entry(ARGS "sql-psql")
-qt_configure_add_summary_entry(ARGS "sql-sqlite")
-qt_configure_add_summary_entry(ARGS "system-sqlite")
-qt_configure_end_summary_section() # end of "Qt Sql Drivers" section
-qt_configure_add_report_entry(
- TYPE WARNING
- MESSAGE "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
- CONDITION WIN32 AND NOT MSVC AND QT_FEATURE_sql_oci
-)
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
deleted file mode 100644
index f738e58a00..0000000000
--- a/src/plugins/sqldrivers/configure.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
- "module": "sqldrivers",
- "depends": [
- "core"
- ],
- "testDir": "../../../config.tests",
-
- "commandline": {
- "assignments": {
- "MYSQL_PATH": "mysql.prefix"
- },
- "options": {
- "mysql_config": "string",
- "psql_config": "string",
- "sqlite": { "type": "enum", "name": "system-sqlite", "values": { "qt": "no", "system": "yes" } },
- "sql-db2": "boolean",
- "sql-ibase": "boolean",
- "sql-mysql": "boolean",
- "sql-oci": "boolean",
- "sql-odbc": "boolean",
- "sql-psql": "boolean",
- "sql-sqlite": "boolean",
- "plugin-sql-db2": { "type": "void", "name": "sql-db2" },
- "plugin-sql-ibase": { "type": "void", "name": "sql-ibase" },
- "plugin-sql-mysql": { "type": "void", "name": "sql-mysql" },
- "plugin-sql-oci": { "type": "void", "name": "sql-oci" },
- "plugin-sql-odbc": { "type": "void", "name": "sql-odbc" },
- "plugin-sql-psql": { "type": "void", "name": "sql-psql" },
- "plugin-sql-sqlite": { "type": "void", "name": "sql-sqlite" }
- }
- },
-
- "libraries": {
- "db2": {
- "label": "DB2 (IBM)",
- "test": {},
- "headers": [ "sqlcli.h", "sqlcli1.h" ],
- "sources": [
- { "libs": "-ldb2cli", "condition": "config.win32" },
- { "libs": "-ldb2", "condition": "!config.win32" }
- ]
- },
- "ibase": {
- "label": "InterBase",
- "test": {},
- "headers": "ibase.h",
- "sources": [
- { "libs": "-lgds32_ms", "condition": "config.win32" },
- { "libs": "-lgds", "condition": "!config.win32" }
- ]
- },
- "mysql": {
- "label": "MySQL",
- "test": {
- "head": [
- "#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)",
- "# include <windows.h>",
- "#endif"
- ],
- "main": "mysql_get_client_version();"
- },
- "headers": "mysql.h",
- "sources": [
- { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
- { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
- { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
- { "type": "mysqlConfig", "query": "--libs", "cleanlibs": false },
- { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
- { "libs": "-llibmariadb", "condition": "config.win32" },
- { "libs": "-llibmysql", "condition": "config.win32" },
- { "libs": "-lmariadb", "condition": "!config.win32" },
- { "libs": "-lmysqlclient", "condition": "!config.win32" }
- ]
- },
- "psql": {
- "label": "PostgreSQL",
- "test": {
- "main": [
- "PQescapeBytea(0, 0, 0);",
- "PQunescapeBytea(0, 0);"
- ]
- },
- "headers": "libpq-fe.h",
- "sources": [
- { "type": "pkgConfig", "args": "libpq" },
- { "type": "psqlConfig" },
- { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" },
- { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
- ]
- },
- "oci": {
- "label": "OCI (Oracle)",
- "test": {},
- "headers": "oci.h",
- "sources": [
- { "libs": "-loci", "condition": "config.win32" },
- { "libs": "-lclntsh", "condition": "!config.win32" }
- ]
- },
- "odbc": {
- "label": "ODBC",
- "test": {
- "head": [
- "#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)",
- "# include <windows.h>",
- "#endif"
- ],
- "main": [
- "SQLHANDLE env;",
- "SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);"
- ]
- },
- "headers": [ "sql.h", "sqlext.h" ],
- "sources": [
- { "libs": "-lodbc32", "condition": "config.win32" },
- { "libs": "-liodbc", "condition": "config.darwin" },
- { "libs": "-lodbc", "condition": "!config.win32 && !config.darwin" }
- ]
- },
- "sqlite3": {
- "label": "SQLite (version 3)",
- "export": "sqlite",
- "test": {
- "main": "sqlite3_open_v2(0, 0, 0, 0);"
- },
- "headers": "sqlite3.h",
- "sources": [
- { "type": "pkgConfig", "args": "sqlite3" },
- "-lsqlite3"
- ],
- "use": [
- { "lib": "zlib", "condition": "!config.win32 && features.system-zlib" }
- ]
- }
- },
-
- "tests": {
- },
-
- "features": {
- "sql-db2": {
- "label": "DB2 (IBM)",
- "condition": "libs.db2",
- "output": [ "privateFeature" ]
- },
- "sql-ibase": {
- "label": "InterBase",
- "condition": "libs.ibase",
- "output": [ "privateFeature" ]
- },
- "sql-mysql": {
- "label": "MySql",
- "condition": "libs.mysql",
- "output": [ "privateFeature" ]
- },
- "sql-oci": {
- "label": "OCI (Oracle)",
- "condition": "libs.oci",
- "output": [ "privateFeature" ]
- },
- "sql-odbc": {
- "label": "ODBC",
- "condition": "features.datestring && libs.odbc",
- "output": [ "privateFeature" ]
- },
- "sql-psql": {
- "label": "PostgreSQL",
- "condition": "libs.psql",
- "output": [ "privateFeature" ]
- },
- "sql-sqlite": {
- "label": "SQLite",
- "condition": "features.datestring",
- "output": [ "privateFeature" ]
- },
- "system-sqlite": {
- "label": " Using system provided SQLite",
- "autoDetect": false,
- "condition": "features.sql-sqlite && libs.sqlite3",
- "output": [ "privateFeature" ]
- }
- },
-
- "report": [
- {
- "type": "warning",
- "condition": "config.win32 && !config.msvc && features.sql-oci",
- "message": "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
- }
- ],
-
- "summary": [
- {
- "section": "Qt Sql Drivers",
- "entries": [
- "sql-db2", "sql-ibase", "sql-mysql", "sql-oci", "sql-odbc", "sql-psql",
- "sql-sqlite", "system-sqlite"
- ]
- }
- ]
-}