Changeset 858

Timestamp:

May 14, 2011, 7:20:41 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

sql: Fixed building MySQL and PSQL plugins.

Location:

trunk/src

Files:

• plugins/sqldrivers/mysql/mysql.pro (modified) (1 diff)
• plugins/sqldrivers/psql/psql.pro (modified) (1 diff)
• sql/drivers/mysql/qsql_mysql.pri (modified) (1 diff)
• sql/drivers/psql/qsql_psql.pri (modified) (1 diff)

trunk/src/plugins/sqldrivers/mysql/mysql.pro

@@ -5 +5 @@
 include(../../../sql/drivers/mysql/qsql_mysql.pri)
 
-os2 {
-    INCLUDEPATH *= $$MYSQL_INCLUDEPATH
-    LIBS        *= $$MYSQL_LIBS    
-}
-
 include(../qsqldriverbase.pri)

trunk/src/plugins/sqldrivers/psql/psql.pro

@@ -5 +5 @@
 include(../../../sql/drivers/psql/qsql_psql.pri)
 
-os2 {
-    INCLUDEPATH *= $$PSQL_INCLUDEPATH
-    LIBS        *= $$PSQL_LIBS    
-}
-
 include(../qsqldriverbase.pri)

trunk/src/sql/drivers/mysql/qsql_mysql.pri

@@ -12 +12 @@
         QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
     }
+} else:os2 {
+    INCLUDEPATH *= $$MYSQL_INCLUDEPATH
+    LIBS        *= $$MYSQL_LIBS    
 } else {
     !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql

trunk/src/sql/drivers/psql/qsql_psql.pri

@@ -6 +6 @@
     !contains(LIBS, .*pq.*):LIBS += -lpq
     QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
-} else {
+} else:os2 {
+    INCLUDEPATH *= $$PSQL_INCLUDEPATH
+    LIBS        *= $$PSQL_LIBS    
+} else:win32 {
     !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
 }