Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Always compile sql drivers as plugins
Compiling the drivers into Qt Sql does not make a lot of sense anymore, as we handle plugins well enough in the build system these days. [ChangeLog][Build system] SQL drivers are now always compiled as plugins. Change-Id: I364b82a480849399d1fafe4b20e9f08922569260 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
- Loading branch information
Showing
51 changed files
with
157 additions
and
389 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| TARGET = qsqldb2 | ||
|
|
||
| SOURCES = main.cpp | ||
| HEADERS += $$PWD/qsql_db2_p.h | ||
| SOURCES += $$PWD/qsql_db2.cpp $$PWD/main.cpp | ||
|
|
||
| unix { | ||
| !contains(LIBS, .*db2.*):LIBS += -ldb2 | ||
| } else { | ||
| !contains(LIBS, .*db2.*):LIBS += -ldb2cli | ||
| } | ||
|
|
||
| OTHER_FILES += db2.json | ||
| include(../../../sql/drivers/db2/qsql_db2.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QDB2DriverPlugin | ||
| include(../qsqldriverbase.pri) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| TARGET = qsqlibase | ||
|
|
||
| SOURCES = main.cpp | ||
| HEADERS += $$PWD/qsql_ibase_p.h | ||
| SOURCES += $$PWD/qsql_ibase.cpp $$PWD/main.cpp | ||
|
|
||
| unix { | ||
| !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds | ||
| } else { | ||
| !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) { | ||
| LIBS += -lgds32_ms | ||
| } | ||
| } | ||
|
|
||
| OTHER_FILES += ibase.json | ||
| include(../../../sql/drivers/ibase/qsql_ibase.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QIBaseDriverPlugin | ||
| include(../qsqldriverbase.pri) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,23 @@ | ||
| TARGET = qsqlmysql | ||
|
|
||
| SOURCES = main.cpp | ||
| HEADERS += $$PWD/qsql_mysql_p.h | ||
| SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp | ||
|
|
||
| QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL | ||
| LIBS += $$QT_LFLAGS_MYSQL | ||
|
|
||
| unix { | ||
| isEmpty(QT_LFLAGS_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 | ||
| } | ||
|
|
||
| OTHER_FILES += mysql.json | ||
| include(../../../sql/drivers/mysql/qsql_mysql.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QMYSQLDriverPlugin | ||
| include(../qsqldriverbase.pri) |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| TARGET = qsqloci | ||
|
|
||
| SOURCES = main.cpp | ||
| HEADERS += $$PWD/qsql_oci_p.h | ||
| SOURCES += $$PWD/qsql_oci.cpp $$PWD/main.cpp | ||
|
|
||
| unix { | ||
| !contains(LIBS, .*clnts.*):LIBS += -lclntsh | ||
| } else { | ||
| LIBS *= -loci | ||
| } | ||
| darwin:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ | ||
|
|
||
| OTHER_FILES += oci.json | ||
| include(../../../sql/drivers/oci/qsql_oci.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QOCIDriverPlugin | ||
| include(../qsqldriverbase.pri) |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,19 @@ | ||
| TARGET = qsqlodbc | ||
|
|
||
| SOURCES = main.cpp | ||
| 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 += $$QT_LFLAGS_ODBC | ||
| } | ||
| } else { | ||
| LIBS *= -lodbc32 | ||
| } | ||
|
|
||
| OTHER_FILES += odbc.json | ||
| include(../../../sql/drivers/odbc/qsql_odbc.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QODBCDriverPlugin | ||
| include(../qsqldriverbase.pri) |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| TARGET = qsqlpsql | ||
|
|
||
| SOURCES = main.cpp | ||
| HEADERS += $$PWD/qsql_psql_p.h | ||
| SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp | ||
|
|
||
| unix|mingw { | ||
| LIBS += $$QT_LFLAGS_PSQL | ||
| !contains(LIBS, .*pq.*):LIBS += -lpq | ||
| QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL | ||
| } else { | ||
| !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 | ||
| } | ||
|
|
||
| OTHER_FILES += psql.json | ||
| include(../../../sql/drivers/psql/qsql_psql.pri) | ||
|
|
||
| PLUGIN_CLASS_NAME = QPSQLDriverPlugin | ||
| include(../qsqldriverbase.pri) |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.