From 426cd97149cededc97cc0475b2ed3b20f269a2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 4 Apr 2025 12:55:43 +0200 Subject: [PATCH] Doc: Rewrite paragraph concerning OpenSSL 1 compatibility Qt 5 compatibility details are not relevant for Qt 6. Instead, make it explicit that the binary builds require OpenSSL 3. Change-Id: I610254026e35def8f8206cd7c7e3015b2197852c Reviewed-by: Timur Pocheptsov Reviewed-by: Alexei Cazacov (cherry picked from commit e89912460fe79bfbdf64b8d2e94a075205e012a1) Reviewed-by: Qt Cherry-pick Bot --- src/network/doc/src/ssl.qdoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index fd6b96ca802..65d7052804b 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -13,11 +13,6 @@ the \l{OpenSSL Toolkit}, or any appropriate TLS plugin to perform encryption and protocol handling. - From Qt version 5.15 onward, the officially supported version for OpenSSL - is 1.1.1 or later. - - Qt version 5.15.1 onward is also compatible with OpenSSL 3. - \annotatedlist ssl For Android applications see \l{Adding OpenSSL Support for Android}. @@ -35,6 +30,10 @@ \c{openssl/opensslv.h} header provided by source or developer packages of OpenSSL. If found, it will enable and build the OpenSSL backend for Qt. + \note While Qt can still support the older OpenSSL 1.1.1 version when built + from sources, the builds of Qt in the \l{Qt Online Installer} require + OpenSSL 3 at runtime. + By default, an OpenSSL-enabled Qt library dynamically loads any installed OpenSSL library at run-time. However, it is possible to link against the library at compile-time by configuring Qt with the \c{-openssl-linked}