summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-13 16:19:35 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-13 16:20:11 (GMT)
commit1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb (patch)
tree35dc3d89e0fa782a9fb1f9d916bfebfddc624900 /src/sql/drivers
parentb8bd51d54025d2b6fceac48ea5cad4ffa69a9b0b (diff)
downloadQt-1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb.zip
Qt-1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb.tar.gz
Qt-1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb.tar.bz2
fix macx not having UNICODE in DEFINES any more
and make the cascade a bit nicer on the way ...
Diffstat (limited to 'src/sql/drivers')
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.pri14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.pri b/src/sql/drivers/odbc/qsql_odbc.pri
index 8394012..66a8d51 100644
--- a/src/sql/drivers/odbc/qsql_odbc.pri
+++ b/src/sql/drivers/odbc/qsql_odbc.pri
@@ -1,13 +1,13 @@
HEADERS += $$PWD/qsql_odbc.h
SOURCES += $$PWD/qsql_odbc.cpp
-mac {
- !contains(LIBS, .*odbc.*):LIBS += -liodbc
-} else:unix {
+unix {
DEFINES += UNICODE
- !contains(LIBS, .*odbc.*):LIBS += $$QT_LFLAGS_ODBC
-} else:win32-borland {
- LIBS *= $(BCB)/lib/PSDK/odbc32.lib
+ !contains(LIBS, .*odbc.*) {
+ macx:LIBS += -liodbc
+ else:LIBS += $$QT_LFLAGS_ODBC
+ }
} else {
- LIBS *= -lodbc32
+ win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib
+ else:LIBS *= -lodbc32
}