diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-26 17:16:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:47:39 +0200 |
| commit | 952788d64bc30c7aac5f9572533241ab8f48fb63 (patch) | |
| tree | f5a36211886621404f9dc5ad82936522b0751f92 /src | |
| parent | 9a8d74de0abdc87b099e1885f2865e16f104d6d8 (diff) | |
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.
Change-Id: Ic27ede2d9531b94aff4c50c1699947ce72caf286
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/ssl.pri | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index c81e461d3f..517e7d541a 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -27,7 +27,18 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { ssl/qsslcertificateextension.cpp # Add optional SSL libs - LIBS_PRIVATE += $$OPENSSL_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" 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 windows:LIBS += -lcrypt32 } |