diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2023-11-10 20:13:37 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2023-11-15 18:25:04 +0100 |
commit | 5565ed24e1f81cef499f7f6e6d8a24db333c8810 (patch) | |
tree | a05fc403db0b432ff589d2167db492ea11b02940 /src/plugins/tls | |
parent | c3a1fe7bd754abc1fc1370e574567aa79b237e31 (diff) |
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.6 6.5
Change-Id: Ib63ccaffacc46e5a313551f1e7c0e02ae09b1a01
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/tls')
-rw-r--r-- | src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp index 2d6e0e2567..4aa9ca6fb1 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) |