summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-12-17 14:55:57 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-01-07 15:32:28 +0100
commitad2da2d27a590333fc89a56fc58700a09c3017b3 (patch)
tree7d916e7a15150d1ba3ca4af7f167e33f9d3c6cc6 /src/plugins/sqldrivers
parentfca3ea040c9d05f112c6fc018f0c8e8c68892642 (diff)
Remove the qmake project files
Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r--src/plugins/sqldrivers/configure.pri85
-rw-r--r--src/plugins/sqldrivers/db2/db2.pro13
-rw-r--r--src/plugins/sqldrivers/ibase/ibase.pro12
-rw-r--r--src/plugins/sqldrivers/mysql/mysql.pro11
-rw-r--r--src/plugins/sqldrivers/oci/oci.pro13
-rw-r--r--src/plugins/sqldrivers/odbc/odbc.pro12
-rw-r--r--src/plugins/sqldrivers/psql/psql.pro11
-rw-r--r--src/plugins/sqldrivers/qsqldriverbase.pri9
-rw-r--r--src/plugins/sqldrivers/sqldrivers.pro14
-rw-r--r--src/plugins/sqldrivers/sqlite/sqlite.pro18
10 files changed, 0 insertions, 198 deletions
diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri
deleted file mode 100644
index be6a930e52..0000000000
--- a/src/plugins/sqldrivers/configure.pri
+++ /dev/null
@@ -1,85 +0,0 @@
-# custom tests
-
-defineTest(qtConfLibrary_psqlConfig) {
- pg_config = $$config.input.psql_config
- isEmpty(pg_config):!cross_compile: \
- pg_config = $$qtConfFindInPath("pg_config")
- !win32:!isEmpty(pg_config) {
- qtRunLoggedCommand("$$pg_config --libdir", libdir)|return(false)
- !qtConfResolvePathLibs($${1}.libs, $$libdir, -lpq): \
- return(false)
- qtRunLoggedCommand("$$pg_config --includedir", includedir)|return(false)
- !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
- return(false)
- return(true)
- }
- qtLog("pg_config not found.")
- return(false)
-}
-
-defineTest(qtConfLibrary_psqlEnv) {
- # Respect PSQL_LIBS if set
- PSQL_LIBS = $$getenv(PSQL_LIBS)
- !isEmpty(PSQL_LIBS) {
- eval(libs = $$PSQL_LIBS)
- !qtConfResolveLibs($${1}.libs, $$libs): \
- return(false)
- } else {
- !qtConfLibrary_inline($$1, $$2): \
- return(false)
- }
- return(true)
-}
-
-defineTest(qtConfLibrary_mysqlConfig) {
- mysql_config = $$config.input.mysql_config
- isEmpty(mysql_config):!cross_compile: \
- mysql_config = $$qtConfFindInPath("mysql_config")
- !isEmpty(mysql_config) {
- qtRunLoggedCommand("$$mysql_config --version", version)|return(false)
- version = $$split(version, '.')
- version = $$first(version)
- isEmpty(version)|lessThan(version, 4): return(false)]
-
- # query is either --libs or --libs_r
- query = $$eval($${1}.query)
- qtRunLoggedCommand("$$mysql_config $$query", libs)|return(false)
- qtRunLoggedCommand("$$mysql_config --include", includedir)|return(false)
- eval(libs = $$libs)
- # -rdynamic should not be returned by mysql_config, but is on RHEL 6.6
- libs -= -rdynamic
- equals($${1}.cleanlibs, true) {
- for(l, libs) {
- # Drop all options besides the -L one and the -lmysqlclient one
- # so we don't unnecessarily link to libs like OpenSSL
- contains(l, "^(-L|-lmysqlclient).*"): cleanlibs += $$l
- }
- libs = $$cleanlibs
- }
- !qtConfResolveLibs($${1}.libs, $$libs): \
- return(false)
- eval(rawincludedir = $$includedir)
- rawincludedir ~= s/^-I//g
- includedir =
- for (id, rawincludedir): \
- includedir += $$clean_path($$id)
- !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
- return(false)
- return(true)
- }
- qtLog("mysql_config not found.")
- return(false)
-}
-
-defineTest(qtConfLibrary_sybaseEnv) {
- libdir =
- sybase = $$getenv(SYBASE)
- !isEmpty(sybase): \
- libdir += $${sybase}/lib
- eval(libs = $$getenv(SYBASE_LIBS))
- isEmpty(libs): \
- libs = $$eval($${1}.libs)
- !qtConfResolvePathLibs($${1}.libs, $$libdir, $$libs): \
- return(false)
- return(true)
-}
diff --git a/src/plugins/sqldrivers/db2/db2.pro b/src/plugins/sqldrivers/db2/db2.pro
deleted file mode 100644
index b99fe91fe3..0000000000
--- a/src/plugins/sqldrivers/db2/db2.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = qsqldb2
-
-HEADERS += $$PWD/qsql_db2_p.h
-SOURCES += $$PWD/qsql_db2.cpp $$PWD/main.cpp
-
-QMAKE_USE += db2
-
-OTHER_FILES += db2.json
-
-equals(QT_ARCH, x86_64): DEFINES += ODBC64
-
-PLUGIN_CLASS_NAME = QDB2DriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/ibase/ibase.pro b/src/plugins/sqldrivers/ibase/ibase.pro
deleted file mode 100644
index e5709207d1..0000000000
--- a/src/plugins/sqldrivers/ibase/ibase.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = qsqlibase
-
-HEADERS += $$PWD/qsql_ibase_p.h
-SOURCES += $$PWD/qsql_ibase.cpp $$PWD/main.cpp
-
-# FIXME: ignores libfb (unix)/fbclient (win32) - but that's for the test anyway
-QMAKE_USE += ibase
-
-OTHER_FILES += ibase.json
-
-PLUGIN_CLASS_NAME = QIBaseDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro
deleted file mode 100644
index 56dd5f598c..0000000000
--- a/src/plugins/sqldrivers/mysql/mysql.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qsqlmysql
-
-HEADERS += $$PWD/qsql_mysql_p.h
-SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp
-
-QMAKE_USE += mysql
-
-OTHER_FILES += mysql.json
-
-PLUGIN_CLASS_NAME = QMYSQLDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro
deleted file mode 100644
index e6ef71f20f..0000000000
--- a/src/plugins/sqldrivers/oci/oci.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TARGET = qsqloci
-
-HEADERS += $$PWD/qsql_oci_p.h
-SOURCES += $$PWD/qsql_oci.cpp $$PWD/main.cpp
-
-QMAKE_USE += oci
-
-darwin:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
-
-OTHER_FILES += oci.json
-
-PLUGIN_CLASS_NAME = QOCIDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
deleted file mode 100644
index 17844f27d2..0000000000
--- a/src/plugins/sqldrivers/odbc/odbc.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = qsqlodbc
-
-HEADERS += $$PWD/qsql_odbc_p.h
-SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp
-
-QMAKE_USE += odbc
-unix: DEFINES += UNICODE
-
-OTHER_FILES += odbc.json
-
-PLUGIN_CLASS_NAME = QODBCDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
deleted file mode 100644
index c44a6319c3..0000000000
--- a/src/plugins/sqldrivers/psql/psql.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qsqlpsql
-
-HEADERS += $$PWD/qsql_psql_p.h
-SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp
-
-QMAKE_USE += psql
-
-OTHER_FILES += psql.json
-
-PLUGIN_CLASS_NAME = QPSQLDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri
deleted file mode 100644
index 4b78fa9454..0000000000
--- a/src/plugins/sqldrivers/qsqldriverbase.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-QT = core core-private sql-private
-
-# For QMAKE_USE in the parent projects.
-include($$shadowed($$PWD)/qtsqldrivers-config.pri)
-
-PLUGIN_TYPE = sqldrivers
-load(qt_plugin)
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro
deleted file mode 100644
index f1db8f65a2..0000000000
--- a/src/plugins/sqldrivers/sqldrivers.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = subdirs
-
-sqldrivers_standalone {
- _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
- load(qt_configure)
-}
-
-qtConfig(sql-psql) : SUBDIRS += psql
-qtConfig(sql-mysql) : SUBDIRS += mysql
-qtConfig(sql-odbc) : SUBDIRS += odbc
-qtConfig(sql-oci) : SUBDIRS += oci
-qtConfig(sql-db2) : SUBDIRS += db2
-qtConfig(sql-sqlite) : SUBDIRS += sqlite
-qtConfig(sql-ibase) : SUBDIRS += ibase
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
deleted file mode 100644
index d7e19f97b1..0000000000
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TARGET = qsqlite
-
-HEADERS += $$PWD/qsql_sqlite_p.h
-SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
-
-include($$OUT_PWD/../qtsqldrivers-config.pri)
-QT_FOR_CONFIG += sqldrivers-private
-
-qtConfig(system-sqlite) {
- QMAKE_USE += sqlite
-} else {
- include($$PWD/../../../3rdparty/sqlite.pri)
-}
-
-OTHER_FILES += sqlite.json
-
-PLUGIN_CLASS_NAME = QSQLiteDriverPlugin
-include(../qsqldriverbase.pri)