Changeset 846 for trunk/config.tests/unix/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)
• config.tests/unix/odbc/odbc.cpp (modified) (2 diffs)
• config.tests/unix/odbc/odbc.pro (modified) (1 diff)

trunk/config.tests/unix/odbc/odbc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -40 +40 @@
 ****************************************************************************/
 
+
+
+
 #include <sql.h>
 #include <sqlext.h>

trunk/config.tests/unix/odbc/odbc.pro

@@ -2 +2 @@
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lodbc
+win32-g++*:LIBS += -lodbc32
+else:LIBS += -lodbc