diff options
author | David Boddie <dboddie@trolltech.com> | 2010-07-16 13:18:04 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-07-16 13:18:04 (GMT) |
commit | 42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0 (patch) | |
tree | 1c5ae2797ac21da8214c7b8cdaeebe49926585d0 /src/plugins/sqldrivers/odbc/odbc.pro | |
parent | e2fb9c4df301678719cb0cff78838b35435c3b38 (diff) | |
parent | ad4aff6e2d188d88a2c6b4b692932adb08491d22 (diff) | |
download | Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.zip Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.tar.gz Qt-42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/plugins/sqldrivers/odbc/odbc.pro')
-rw-r--r-- | src/plugins/sqldrivers/odbc/odbc.pro | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index 2bf85f1..677eb6e 100644 --- a/src/plugins/sqldrivers/odbc/odbc.pro +++ b/src/plugins/sqldrivers/odbc/odbc.pro @@ -1,19 +1,6 @@ -TARGET = qsqlodbc +TARGET = qsqlodbc -HEADERS = ../../../sql/drivers/odbc/qsql_odbc.h -SOURCES = main.cpp \ - ../../../sql/drivers/odbc/qsql_odbc.cpp - -unix { - !contains( LIBS, .*odbc.* ) { - LIBS *= $$QT_LFLAGS_ODBC - } - DEFINES += UNICODE -} - -win32 { - !win32-borland:LIBS *= -lodbc32 - win32-borland:LIBS *= $(BCB)/lib/PSDK/odbc32.lib -} +SOURCES = main.cpp +include(../../../sql/drivers/odbc/qsql_odbc.pri) include(../qsqldriverbase.pri) |