diff -r ef0373b55136 -r 758a864f9613 src/sql/drivers/psql/qsql_psql.pri --- a/src/sql/drivers/psql/qsql_psql.pri Fri Sep 17 08:34:18 2010 +0300 +++ b/src/sql/drivers/psql/qsql_psql.pri Mon Oct 04 01:19:32 2010 +0300 @@ -2,12 +2,9 @@ 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 }