From 5e2367aaa5137f27c722cd7f8474696b0fbaa099 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Oct 2016 20:39:11 +0200 Subject: use regular configure mechanism for openssl library references don't attempt to hand-craft a library export any more. instead, use the configure system's built-in mechanism, and refer to it via QMAKE_USE. this also allows us to rely on transitive dependencies in the autotest. as a side effect, this makes the openssl-linked feature imply the openssl one. Change-Id: I5dd209b63bc8fbbc62852f6ffc472d4452ea2e68 Reviewed-by: Lars Knoll --- tests/auto/network/ssl/qsslsocket/qsslsocket.pro | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tests/auto/network') diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index 5c92ca833a..4ccf0f24b0 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -14,12 +14,6 @@ win32 { } } -# OpenSSL support -qtConfig(openssl)|qtConfig(openssl-linked) { - # Add optional SSL libs - LIBS += $$OPENSSL_LIBS -} - DEFINES += SRCDIR=\\\"$$PWD/\\\" requires(qtConfig(private_tests)) -- cgit v1.2.3