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

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/oci/main.cpp (modified) (1 diff)
• src/plugins/sqldrivers/oci/oci.pro (modified) (1 diff)

trunk/src/plugins/sqldrivers/oci/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/oci/oci.pro

@@ -1 @@
-TARGET   = qsqloci
+TARGET = qsqloci
 
-HEADERS         = ../../../sql/drivers/oci/qsql_oci.h
-SOURCES         = main.cpp \
-                  ../../../sql/drivers/oci/qsql_oci.cpp
-
-win32:LIBS      *= -loci
-
-unix:!contains( LIBS, .*clnts.* ):LIBS  *= -lclntsh
-
-macx:QMAKE_LFLAGS += -Wl,-flat_namespace,-U,_environ
+SOURCES = main.cpp
+include(../../../sql/drivers/oci/qsql_oci.pri)
 
 include(../qsqldriverbase.pri)