diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-07-07 10:05:36 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-07 10:05:36 (GMT) |
| commit | d7557de99b38031906c17c54496cb76a13dec5f7 (patch) | |
| tree | 975c545f8c19edb5d7ccc84c7444db7d9b1da9ac /src/plugins/sqldrivers/mysql | |
| parent | 42fe2bfb65c85fc630efe32aa1d62d66f2caab2a (diff) | |
| download | Qt-d7557de99b38031906c17c54496cb76a13dec5f7.zip Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.gz Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.bz2 | |
Consolidate sql driver configuration redundancy
Previously sql driver recipes each appeared in both the plugin
pro file and src/sql/drivers/drivers.pri for building into QtSql.
Split driver recipes into shared pri files.
Also split bundled 3rd party sqlite code recipe into a shared pri.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/sqldrivers/mysql')
| -rw-r--r-- | src/plugins/sqldrivers/mysql/mysql.pro | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro index b808c8e..b6d42ff 100644 --- a/src/plugins/sqldrivers/mysql/mysql.pro +++ b/src/plugins/sqldrivers/mysql/mysql.pro @@ -1,23 +1,6 @@ TARGET = qsqlmysql -HEADERS = ../../../sql/drivers/mysql/qsql_mysql.h -SOURCES = main.cpp \ - ../../../sql/drivers/mysql/qsql_mysql.cpp - -unix: { - isEmpty(QT_LFLAGS_MYSQL) { - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { - use_libmysqlclient_r:LIBS *= -lmysqlclient_r - else:LIBS *= -lmysqlclient - } - } else { - LIBS *= $$QT_LFLAGS_MYSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL - } -} - -win32:!contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*) { - LIBS *= -llibmysql -} +SOURCES = main.cpp +include(../../../sql/drivers/mysql/qsql_mysql.pri) include(../qsqldriverbase.pri) |