summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r--src/plugins/sqldrivers/mysql/mysql.pro14
-rw-r--r--src/plugins/sqldrivers/odbc/odbc.pro11
-rw-r--r--src/plugins/sqldrivers/psql/psql.pro8
-rw-r--r--src/plugins/sqldrivers/sqlite/sqlite.pro5
-rw-r--r--src/plugins/sqldrivers/tds/tds.pro8
5 files changed, 7 insertions, 39 deletions
diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro
index 3bd8cd0040..56dd5f598c 100644
--- a/src/plugins/sqldrivers/mysql/mysql.pro
+++ b/src/plugins/sqldrivers/mysql/mysql.pro
@@ -3,19 +3,7 @@ TARGET = qsqlmysql
HEADERS += $$PWD/qsql_mysql_p.h
SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp
-QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_MYSQL
-LIBS += $$QMAKE_LIBS_MYSQL
-
-unix {
- isEmpty(QMAKE_LIBS_MYSQL) {
- !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
- use_libmysqlclient_r:LIBS += -lmysqlclient_r
- else:LIBS += -lmysqlclient
- }
- }
-} else {
- !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql
-}
+QMAKE_USE += mysql
OTHER_FILES += mysql.json
diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
index 0e49f1ac66..17844f27d2 100644
--- a/src/plugins/sqldrivers/odbc/odbc.pro
+++ b/src/plugins/sqldrivers/odbc/odbc.pro
@@ -3,15 +3,8 @@ TARGET = qsqlodbc
HEADERS += $$PWD/qsql_odbc_p.h
SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp
-unix {
- DEFINES += UNICODE
- !contains(LIBS, .*odbc.*) {
- osx:LIBS += -liodbc
- else:LIBS += $$QMAKE_LIBS_ODBC
- }
-} else {
- LIBS *= -lodbc32
-}
+QMAKE_USE += odbc
+unix: DEFINES += UNICODE
OTHER_FILES += odbc.json
diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
index 4a05266120..c44a6319c3 100644
--- a/src/plugins/sqldrivers/psql/psql.pro
+++ b/src/plugins/sqldrivers/psql/psql.pro
@@ -3,13 +3,7 @@ TARGET = qsqlpsql
HEADERS += $$PWD/qsql_psql_p.h
SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp
-unix|mingw {
- LIBS += $$QMAKE_LIBS_PSQL
- !contains(LIBS, .*pq.*):LIBS += -lpq
- QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_PSQL
-} else {
- !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
-}
+QMAKE_USE += psql
OTHER_FILES += psql.json
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
index c98655f85c..bcdf7d36f3 100644
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ b/src/plugins/sqldrivers/sqlite/sqlite.pro
@@ -3,11 +3,10 @@ TARGET = qsqlite
HEADERS += $$PWD/qsql_sqlite_p.h
SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
-!system-sqlite:!contains(LIBS, .*sqlite3.*) {
+!system-sqlite {
include($$PWD/../../../3rdparty/sqlite.pri)
} else {
- LIBS += $$QMAKE_LIBS_SQLITE
- QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_SQLITE
+ QMAKE_USE += sqlite
}
OTHER_FILES += sqlite.json
diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
index b5d32ae5a8..67bc0f5c48 100644
--- a/src/plugins/sqldrivers/tds/tds.pro
+++ b/src/plugins/sqldrivers/tds/tds.pro
@@ -3,13 +3,7 @@ TARGET = qsqltds
HEADERS += $$PWD/qsql_tds_p.h
SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp
-unix|mingw: {
- LIBS += $$QMAKE_LIBS_TDS
- !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
- QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_TDS
-} else {
- LIBS *= -lNTWDBLIB
-}
+QMAKE_USE += tds
OTHER_FILES += tds.json