diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-07 12:22:02 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-07 12:22:02 (GMT) |
| commit | 61ed7fb16caff96d2cc57d5f4ab7c10c8535e7a9 (patch) | |
| tree | a6dd9264da6e8878b857895a2595565ce9a37538 /src/plugins/sqldrivers/mysql/mysql.pro | |
| parent | 896de79554060aadf4963d8285ef3f5d8740428b (diff) | |
| parent | 484c05ef374ef1c1043836b074693838d6b30adb (diff) | |
| download | Qt-61ed7fb16caff96d2cc57d5f4ab7c10c8535e7a9.zip Qt-61ed7fb16caff96d2cc57d5f4ab7c10c8535e7a9.tar.gz Qt-61ed7fb16caff96d2cc57d5f4ab7c10c8535e7a9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/sqldrivers/mysql/mysql.pro')
| -rw-r--r-- | src/plugins/sqldrivers/mysql/mysql.pro | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro index 9f5c619..b6d42ff 100644 --- a/src/plugins/sqldrivers/mysql/mysql.pro +++ b/src/plugins/sqldrivers/mysql/mysql.pro @@ -1,23 +1,6 @@ -TARGET = qsqlmysql +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) |