From 1404c38ad9d1bf5412ca49da7b2b50295d0ce0fb Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 13 Jul 2010 18:19:35 +0200
Subject: fix macx not having UNICODE in DEFINES any more

and make the cascade a bit nicer on the way ...
---
 src/sql/drivers/odbc/qsql_odbc.pri | 14 +++++++-------
 1 file 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
 }
-- 
cgit v0.12