summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-07-25 16:57:14 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-08-15 13:36:33 (GMT)
commit9622b544ad4186ff0d69a0424ed027a0d960b00f (patch)
tree935a2bc7a1ae870ae040e8342307a477841b3db0 /src/network/ssl
parent374c5f5c5ac72f1d564cc780e083b6c30eefb74b (diff)
downloadQt-9622b544ad4186ff0d69a0424ed027a0d960b00f.zip
Qt-9622b544ad4186ff0d69a0424ed027a0d960b00f.tar.gz
Qt-9622b544ad4186ff0d69a0424ed027a0d960b00f.tar.bz2
add configure options for debug/release OpenSSL
msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/ssl.pri13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 8b2e2c1..0f4fb67 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -32,5 +32,18 @@ symbian {
ssl/qsslsocket_openssl_symbols.cpp
# Add optional SSL libs
+ # Static linking of OpenSSL with msvc:
+ # - Binaries http://slproweb.com/products/Win32OpenSSL.html
+ # - also needs -lUser32 -lAdvapi32 -lGdi32 -lCrypt32
+ # - libs in <OPENSSL_DIR>\lib\VC\static
+ # - configure: -openssl -openssl-linked -I <OPENSSL_DIR>\include -L <OPENSSL_DIR>\lib\VC\static OPENSSL_LIBS="-lUser32 -lAdvapi32 -lGdi32 -lCrypt32" OPENSSL_LIBS_DEBUG="-lssleay32MDd -llibeay32MDd" OPENSSL_LIBS_RELEASE="-lssleay32MD -llibeay32MD"
+
+ CONFIG(debug, debug|release) {
+ LIBS_PRIVATE += $$OPENSSL_LIBS_DEBUG
+ } else {
+ LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
+ }
+
LIBS_PRIVATE += $$OPENSSL_LIBS
+
}