diff options
author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
---|---|---|
committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
commit | f39c9f38276add6ead9bb5d380cc2b32b0fa3390 (patch) | |
tree | 2627db65ca9cddb432232ee21116afea73da07a4 /config.tests/unix/odbc/odbc.pro | |
parent | 594900e68f8e264facbe8c75eaf2b857240bc072 (diff) | |
parent | fac227f609e544f8f55aca8447b4328d6534407a (diff) | |
download | Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.zip Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.gz Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'config.tests/unix/odbc/odbc.pro')
-rw-r--r-- | config.tests/unix/odbc/odbc.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro index c588ede..06a548f 100644 --- a/config.tests/unix/odbc/odbc.pro +++ b/config.tests/unix/odbc/odbc.pro @@ -1,4 +1,5 @@ SOURCES = odbc.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -lodbc +win32-g++*:LIBS += -lodbc32 +else:LIBS += -lodbc |