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

Schannel: Fix version functions

Browse Source 
Previously they all returned the runtime versions and one string
function did not include the backend's name.
The NTDDI_VERSION macro is what we use to base certain
feature-availability on during compilation so it makes the most sense to
use for the build-string.

Pick-to: 6.2
Change-Id: I96b025a5a05c0bbb4db3d5ee68656e0df5f4eb07
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2021-06-08 16:07:21 +02:00
parent d325f63d99
commit 76b0713d6e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/tls/schannel/qtls_schannel.cpp
View File

@ -210,7 +210,7 @@ long QSchannelBackend::tlsLibraryVersionNumber() const
QString QSchannelBackend::tlsLibraryVersionString() const QString QSchannelBackend::tlsLibraryVersionString() const
{ {
const auto os = QOperatingSystemVersion::current(); const auto os = QOperatingSystemVersion::current();
return QString::fromLatin1("Secure Channel, %1 %2.%3.%4") return QLatin1String("Secure Channel, %1 %2.%3.%4")
.arg(os.name(), .arg(os.name(),
QString::number(os.majorVersion()), QString::number(os.majorVersion()),
QString::number(os.minorVersion()), QString::number(os.minorVersion()),
@ -219,16 +219,13 @@ QString QSchannelBackend::tlsLibraryVersionString() const
long QSchannelBackend::tlsLibraryBuildVersionNumber() const long QSchannelBackend::tlsLibraryBuildVersionNumber() const
{ {
return tlsLibraryVersionNumber(); return NTDDI_VERSION;
} }
QString QSchannelBackend::tlsLibraryBuildVersionString() const QString QSchannelBackend::tlsLibraryBuildVersionString() const
{ {
const auto os = QOperatingSystemVersion::current(); return QLatin1String("Secure Channel (NTDDI: 0x%1)")
return QString::fromLatin1("%1.%2.%3") .arg(QString::number(NTDDI_VERSION, 16).toUpper());
.arg(QString::number(os.majorVersion()),
QString::number(os.minorVersion()),
QString::number(os.microVersion()));
} }
void QSchannelBackend::ensureInitialized() const void QSchannelBackend::ensureInitialized() const