diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-08-03 14:37:05 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-04 12:29:09 (GMT) |
| commit | 2c7621730d30ac418874c18036a7aa34e2aae1d0 (patch) | |
| tree | fadbdad03e58e378a7820d2f3edc6927dd6e23a1 /src/sql | |
| parent | f2b5d057252870a3d6c1cf24e848a740c697ea99 (diff) | |
| download | Qt-2c7621730d30ac418874c18036a7aa34e2aae1d0.zip Qt-2c7621730d30ac418874c18036a7aa34e2aae1d0.tar.gz Qt-2c7621730d30ac418874c18036a7aa34e2aae1d0.tar.bz2 | |
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Consistent with QT_LFLAGS_* for other database drivers.
Support added to configure shell script and configure.exe.
Respect SYBASE and SYBASE_LIBS.
Use QT_LFLAGS_TDS in project files.
Merge-request: 2416
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/tds/qsql_tds.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri index c552ead..037f793 100644 --- a/src/sql/drivers/tds/qsql_tds.pri +++ b/src/sql/drivers/tds/qsql_tds.pri @@ -1,8 +1,10 @@ HEADERS += $$PWD/qsql_tds.h SOURCES += $$PWD/qsql_tds.cpp -unix { +unix|win32-g++: { + !isEmpty(QT_LFLAGS_TDS):!static:LIBS *= $$QT_LFLAGS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb + QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS } else:win32-borland { LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB } else { |