From 89f0f34db516d74e5d20afe7131bce257589538d Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 21 Oct 2023 10:55:32 +0200 Subject: [PATCH] tst_QSslSocket: Remove compile-time #ifdef check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we use runtime plugins now and the test doesn't use any symbols from openssl Amends 486b1aec1606d6d778da6203e28640cd79ae0291 Pick-to: 6.6 6.5 Change-Id: Ib66d1ca15835c41fe138c7830ce3edd0bdce0d5f Reviewed-by: MÃ¥rten Nordheim --- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index 0f85221087d..66711cce45b 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1661,8 +1661,6 @@ void tst_QSslSocket::protocolServerSide() QCOMPARE(client.isEncrypted(), works); } -#if QT_CONFIG(openssl) - void tst_QSslSocket::serverCipherPreferences() { if (!isTestingOpenSsl) @@ -1757,8 +1755,6 @@ void tst_QSslSocket::serverCipherPreferences() } } -#endif // Feature 'openssl'. - void tst_QSslSocket::setCaCertificates() {