diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-06 20:34:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 18:55:43 +0200 |
| commit | 0ef4bf1c1e77d4b11f5f17babdd0065723901a7d (patch) | |
| tree | 46a2f532921aef6991a912842ca4d418c4fa1a72 /src/network/ssl | |
| parent | bd7331cb3358087d9d3f787d39ce7aff5335d8c5 (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/network/ssl')
| -rw-r--r-- | src/network/ssl/ssl.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 517e7d541a..8ebb4b29af 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -41,4 +41,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { LIBS_PRIVATE += $$OPENSSL_LIBS windows:LIBS += -lcrypt32 + + !isEmpty(OPENSSL_PATH) { + INCLUDEPATH += $$OPENSSL_PATH/include + QMAKE_LIBDIR += $$OPENSSL_PATH/lib + } } |