From bccbc7e716f77540c59b5ea94fff6b26dcb46dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 10 Nov 2023 20:13:37 +0100 Subject: [PATCH] qopenssl: fix accidental pessimization The toLatin1 wasn't necessary, the argument should be QString. The plugin isn't currently built with the ASCII ctors disabled, so it passed through CI unnoticed. Amends 3159b337f01767412f51c649d30a72ac8417989b Pick-to: 6.5 Change-Id: Ib63ccaffacc46e5a313551f1e7c0e02ae09b1a01 Reviewed-by: Timur Pocheptsov (cherry picked from commit 5565ed24e1f81cef499f7f6e6d8a24db333c8810) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp index 2d6e0e25671..4aa9ca6fb14 100644 --- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp +++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -756,7 +756,7 @@ static LoadedOpenSsl loadOpenSsl() // OpenSSL v.3 does not have SLIB_VERSION_NUMBER but has OPENSSL_SHLIB_VERSION. // The comment about OPENSSL_SHLIB_VERSION in opensslv.h is a bit troublesome: // "This is defined in free form." - auto shlibVersion = QString("%1"_L1).arg(OPENSSL_SHLIB_VERSION).toLatin1(); + auto shlibVersion = QString("%1"_L1).arg(OPENSSL_SHLIB_VERSION); libssl->setFileNameAndVersion("ssl"_L1, shlibVersion); libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); #elif defined(SHLIB_VERSION_NUMBER)