From 0452c25aedb7d2778e5b26fad924ed61b72bbe33 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Fri, 18 Mar 2016 13:35:40 +0100
Subject: Always compile sql drivers as plugins

Compiling the drivers into Qt Sql does not make a lot of sense
anymore, as we handle plugins well enough in the build system
these days.

[ChangeLog][Build system] SQL drivers are now always compiled as plugins.

Change-Id: I364b82a480849399d1fafe4b20e9f08922569260
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
---
 src/plugins/sqldrivers/odbc/odbc.pro | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/plugins/sqldrivers/odbc/odbc.pro')

diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
index c0020c065f..e002f06576 100644
--- a/src/plugins/sqldrivers/odbc/odbc.pro
+++ b/src/plugins/sqldrivers/odbc/odbc.pro
@@ -1,8 +1,19 @@
 TARGET = qsqlodbc
 
-SOURCES = main.cpp
+HEADERS += $$PWD/qsql_odbc_p.h
+SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp
+
+unix {
+    DEFINES += UNICODE
+    !contains(LIBS, .*odbc.*) {
+        osx:LIBS += -liodbc
+        else:LIBS += $$QT_LFLAGS_ODBC
+    }
+} else {
+    LIBS *= -lodbc32
+}
+
 OTHER_FILES += odbc.json
-include(../../../sql/drivers/odbc/qsql_odbc.pri)
 
 PLUGIN_CLASS_NAME = QODBCDriverPlugin
 include(../qsqldriverbase.pri)
-- 
cgit v1.2.3