Changeset 846 for trunk/src/plugins/sqldrivers/odbc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/sqldrivers/odbc/main.cpp (modified) (1 diff)
• src/plugins/sqldrivers/odbc/odbc.pro (modified) (1 diff)

trunk/src/plugins/sqldrivers/odbc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/sqldrivers/odbc/odbc.pro

@@ -1 @@
-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)