diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-08-25 08:05:15 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-25 08:07:43 (GMT) |
| commit | 41532e38ff2b5153b79374032112d435b42e48a2 (patch) | |
| tree | 67410b27c647c2be817a1300efe354d08eff7e02 /src/sql | |
| parent | 69f5543cceaed4b5836e3671f65c32235ea0e8eb (diff) | |
| download | Qt-41532e38ff2b5153b79374032112d435b42e48a2.zip Qt-41532e38ff2b5153b79374032112d435b42e48a2.tar.gz Qt-41532e38ff2b5153b79374032112d435b42e48a2.tar.bz2 | |
scope fixes and clutter reduction for sql driver projects
Add missing wildcard to scope where meant to include all
win32-g++ targets.
There is no reason to ignore QT_LFLAGS_TDS and QT_LFLAGS_PSQL
in static builds. Via LIBS these may end up in QMAKE_PRL_LIBS
in QtSql.prl. Also, the isEmpty() tests on these is
redundant and only wastes time.
Processing of QT_CFLAGS_PSQL should not depend on QT_LFLAGS_PSQL.
It no longer seems appropriate to clean up "-lz" here in
case of zlib bundled in QtCore. It's reasonable to expect
QT_LFLAGS_PSQL to be ready after configure.
Merge-request: 2459
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.pri | 7 | ||||
| -rw-r--r-- | src/sql/drivers/tds/qsql_tds.pri | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri index 97db4be..6da3540 100644 --- a/src/sql/drivers/psql/qsql_psql.pri +++ b/src/sql/drivers/psql/qsql_psql.pri @@ -2,12 +2,9 @@ HEADERS += $$PWD/qsql_psql.h SOURCES += $$PWD/qsql_psql.cpp unix|win32-g++* { - !static:!isEmpty(QT_LFLAGS_PSQL) { - !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz - LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL - } + LIBS *= $$QT_LFLAGS_PSQL !contains(LIBS, .*pq.*):LIBS += -lpq + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL } else { !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 } diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri index 037f793..521c06b 100644 --- a/src/sql/drivers/tds/qsql_tds.pri +++ b/src/sql/drivers/tds/qsql_tds.pri @@ -1,8 +1,8 @@ HEADERS += $$PWD/qsql_tds.h SOURCES += $$PWD/qsql_tds.cpp -unix|win32-g++: { - !isEmpty(QT_LFLAGS_TDS):!static:LIBS *= $$QT_LFLAGS_TDS +unix|win32-g++*: { + LIBS *= $$QT_LFLAGS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS } else:win32-borland { |