summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers/mysql
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer@kdab.com>2012-08-06 20:34:34 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-07 18:55:43 +0200
commit0ef4bf1c1e77d4b11f5f17babdd0065723901a7d (patch)
tree46a2f532921aef6991a912842ca4d418c4fa1a72 /src/sql/drivers/mysql
parentbd7331cb3358087d9d3f787d39ce7aff5335d8c5 (diff)
Add possibility to add OpenSSL, DBUS, MySQL path under Windows
Under Windows it's quite possible that OpenSSL, DBUS or MySQL is not installed into a central place. If -I and -L is passed at configure time, it is added to all targets, and if that path contained a conflicting header things would go wrong. Change-Id: Ic3338c49aa6eaa91b3abf5341e709ef604bf7aab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/sql/drivers/mysql')
-rw-r--r--src/sql/drivers/mysql/qsql_mysql.pri5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
index 1b9c3dd8ca..c9ec2575fa 100644
--- a/src/sql/drivers/mysql/qsql_mysql.pri
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
@@ -1,6 +1,11 @@
HEADERS += $$PWD/qsql_mysql.h
SOURCES += $$PWD/qsql_mysql.cpp
+!isEmpty(MYSQL_PATH) {
+ INCLUDEPATH += $$MYSQL_PATH/include
+ QMAKE_LIBDIR += $$MYSQL_PATH/lib
+}
+
unix {
isEmpty(QT_LFLAGS_MYSQL) {
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {