summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-12 16:36:50 +0200
committerKai Koehne <kai.koehne@qt.io>2016-10-14 08:56:46 +0000
commitaec9cebf8c1ef4b9d497f76337d7af0b8b5f8d46 (patch)
treefc1f2936a74051985d66d9f92e3c5c38e6846fbb /src
parentf71aa48138e939ccb687ffab6afca734b1b13973 (diff)
make setting OPENSSL_LIBS_{DEBUG,RELEASE} work with dynamic builds
while it's probably not really necessary (which is why it wasn't implemented before), just ignoring the options is somewhat inconsistent and a deviation from historical behavior. Task-number: QTBUG-55530 Change-Id: I9441bf7be50ab5c997bb745e2525048ca23e4cd5 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/configure.json9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index 97bf92167d..124fa1718f 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -60,7 +60,14 @@
},
"condition": "config.win32 && !features.shared"
},
- { "libs": "-lssleay32 -llibeay32", "condition": "config.win32 && features.shared" },
+ {
+ "libs": "-lssleay32 -llibeay32",
+ "builds": {
+ "debug": "",
+ "release": ""
+ },
+ "condition": "config.win32 && features.shared"
+ },
{ "libs": "-lssl -lcrypto", "condition": "!config.win32" }
]
}