Changeset 858


Ignore:
Timestamp:
May 14, 2011, 5:20:41 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

sql: Fixed building MySQL and PSQL plugins.

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plugins/sqldrivers/mysql/mysql.pro

    r846 r858  
    55include(../../../sql/drivers/mysql/qsql_mysql.pri)
    66
    7 os2 {
    8     INCLUDEPATH *= $$MYSQL_INCLUDEPATH
    9     LIBS        *= $$MYSQL_LIBS   
    10 }
    11 
    127include(../qsqldriverbase.pri)
  • trunk/src/plugins/sqldrivers/psql/psql.pro

    r846 r858  
    55include(../../../sql/drivers/psql/qsql_psql.pri)
    66
    7 os2 {
    8     INCLUDEPATH *= $$PSQL_INCLUDEPATH
    9     LIBS        *= $$PSQL_LIBS   
    10 }
    11 
    127include(../qsqldriverbase.pri)
  • trunk/src/sql/drivers/mysql/qsql_mysql.pri

    r846 r858  
    1212        QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
    1313    }
     14} else:os2 {
     15    INCLUDEPATH *= $$MYSQL_INCLUDEPATH
     16    LIBS        *= $$MYSQL_LIBS   
    1417} else {
    1518    !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql
  • trunk/src/sql/drivers/psql/qsql_psql.pri

    r846 r858  
    66    !contains(LIBS, .*pq.*):LIBS += -lpq
    77    QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
    8 } else {
     8} else:os2 {
     9    INCLUDEPATH *= $$PSQL_INCLUDEPATH
     10    LIBS        *= $$PSQL_LIBS   
     11} else:win32 {
    912    !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
    1013}
Note: See TracChangeset for help on using the changeset viewer.