From f6d09d426b66dd49a3d7917ff055d34f37e109f3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 21 Oct 2020 12:40:22 +0200 Subject: Fix tst_qsslkey to compile when SSL is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move it to the section requiring SSL tests since it requires QSslConfiguration. Change-Id: I5c807976ce75fa5967bddb8edd7788dbfbb89375 Reviewed-by: Mårten Nordheim --- tests/auto/network/ssl/CMakeLists.txt | 4 +++- tests/auto/network/ssl/ssl.pro | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/network/ssl/CMakeLists.txt b/tests/auto/network/ssl/CMakeLists.txt index 6d4dc15cc8..0b267dd29c 100644 --- a/tests/auto/network/ssl/CMakeLists.txt +++ b/tests/auto/network/ssl/CMakeLists.txt @@ -5,7 +5,9 @@ add_subdirectory(qsslcertificate) add_subdirectory(qsslcipher) add_subdirectory(qsslellipticcurve) add_subdirectory(qsslerror) -add_subdirectory(qsslkey) +if(QT_FEATURE_ssl) + add_subdirectory(qsslkey) +endif() if(QT_FEATURE_private_tests AND QT_FEATURE_ssl) add_subdirectory(qsslsocket) add_subdirectory(qsslsocket_onDemandCertificates_member) diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro index 014ff34064..3477a6c90e 100644 --- a/tests/auto/network/ssl/ssl.pro +++ b/tests/auto/network/ssl/ssl.pro @@ -6,10 +6,10 @@ SUBDIRS=\ qsslcertificate \ qsslcipher \ qsslellipticcurve \ - qsslerror \ - qsslkey \ + qsslerror qtConfig(ssl) { + SUBDIRS += qsslkey qtConfig(private_tests) { SUBDIRS += \ qsslsocket \ -- cgit v1.2.3