summaryrefslogtreecommitdiffstats
path: root/src/plugins/sqldrivers/oci
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-07-07 10:05:36 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-07 10:05:36 (GMT)
commitd7557de99b38031906c17c54496cb76a13dec5f7 (patch)
tree975c545f8c19edb5d7ccc84c7444db7d9b1da9ac /src/plugins/sqldrivers/oci
parent42fe2bfb65c85fc630efe32aa1d62d66f2caab2a (diff)
downloadQt-d7557de99b38031906c17c54496cb76a13dec5f7.zip
Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.gz
Qt-d7557de99b38031906c17c54496cb76a13dec5f7.tar.bz2
Consolidate sql driver configuration redundancy
Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/sqldrivers/oci')
-rw-r--r--src/plugins/sqldrivers/oci/oci.pro11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/sqldrivers/oci/oci.pro b/src/plugins/sqldrivers/oci/oci.pro
index d75827e..d7dcce9 100644
--- a/src/plugins/sqldrivers/oci/oci.pro
+++ b/src/plugins/sqldrivers/oci/oci.pro
@@ -1,13 +1,6 @@
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)