1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qopenssl: fix accidental pessimization

Browse Source 
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 <timur.pocheptsov@qt.io>
(cherry picked from commit 5565ed24e1f81cef499f7f6e6d8a24db333c8810)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2023-11-10 20:13:37 +01:00 committed by Qt Cherry-pick Bot
parent 4a1f511779
commit bccbc7e716
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
View File

@ -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)