From 190e5af111a37928a434cdac051bd0d2f8a1e92d Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Thu, 1 Dec 2022 13:00:54 +0100
Subject: [PATCH] Try fixing auto-tests that need resolving openssl symbols
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the case of static builds. Also, remove somewhat funny comment
from the shared tlshelpers.h file.

Fixes: QTBUG-105046
Pick-to: 6.4 6.2
Change-Id: I2fd677a11b64df89c0ad0237e1014f5e80144c24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 tests/auto/network/ssl/qocsp/CMakeLists.txt      | 6 ++++++
 tests/auto/network/ssl/qsslkey/CMakeLists.txt    | 5 +++++
 tests/auto/network/ssl/qsslsocket/CMakeLists.txt | 5 +++++
 tests/auto/network/ssl/shared/tlshelpers.h       | 5 -----
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt
index c739e89583..384c7b9426 100644
--- a/tests/auto/network/ssl/qocsp/CMakeLists.txt
+++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt
@@ -15,6 +15,12 @@ qt_internal_add_test(tst_qocsp
         Qt::NetworkPrivate
 )
 
+qt_internal_extend_target(tst_qocsp CONDITION QT_FEATURE_openssl_linked
+    LIBRARIES
+        WrapOpenSSL::WrapOpenSSL
+)
+
+
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
index 0177ab7055..a720962655 100644
--- a/tests/auto/network/ssl/qsslkey/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
@@ -25,6 +25,11 @@ qt_internal_add_test(tst_qsslkey
     TESTDATA ${test_data}
 )
 
+qt_internal_extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked
+    LIBRARIES
+        WrapOpenSSL::WrapOpenSSL
+)
+
 ## Scopes:
 #####################################################################
 
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
index 8a7a069edd..cf43cd6c54 100644
--- a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -25,6 +25,11 @@ qt_internal_add_test(tst_qsslsocket
     QT_TEST_SERVER_LIST "squid" "danted" "cyrus" "apache2" "echo" # special case
 )
 
+qt_internal_extend_target(tst_qsslsocket CONDITION QT_FEATURE_private_tests AND QT_FEATURE_openssl_linked
+    LIBRARIES
+        WrapOpenSSL::WrapOpenSSL
+)
+
 #### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
 # _REQUIREMENTS = "qtConfig(private_tests)"
 
diff --git a/tests/auto/network/ssl/shared/tlshelpers.h b/tests/auto/network/ssl/shared/tlshelpers.h
index aa5f2c3c58..71db837d4b 100644
--- a/tests/auto/network/ssl/shared/tlshelpers.h
+++ b/tests/auto/network/ssl/shared/tlshelpers.h
@@ -12,13 +12,8 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qglobal.h>
 
-// TODO: these 'helpers' later to include OpenSSL resolver/sumbols
-// required by some auto-tests.
-
 QT_BEGIN_NAMESPACE
 
-
-
 namespace TlsAux {
 
 inline bool classImplemented(QSsl::ImplementedClass cl)