summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-10-12 09:19:11 +0200
committerKai Koehne <kai.koehne@qt.io>2016-10-14 08:56:32 +0000
commitf71aa48138e939ccb687ffab6afca734b1b13973 (patch)
tree412e06d41dd7f3892f94dc255614996bded8a271 /src
parent2b9fe7d42d3e143edf8879c7af7725713611b0d3 (diff)
Fix resolution of OPENSSL_LIBS in ssl.pri
Task-number: QTBUG-55530 Change-Id: Icc5ae9849e41479732eb44d01d9ea37aa3da16f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/ssl/ssl.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 8139af50af..79351017a6 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -79,6 +79,8 @@ qtConfig(ssl) {
# - 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"
+ include($$OUT_PWD/qtnetwork-config.pri)
+
CONFIG(debug, debug|release) {
LIBS_PRIVATE += $$OPENSSL_LIBS_DEBUG
} else {