diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-06-08 16:07:21 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-14 16:54:12 +0000 |
| commit | c2c8a6ecd98500b724ab46fd0dd9e27b09be4d11 (patch) | |
| tree | ef15f4e465c2c784da8e4be6c4a97abaa5655983 /src | |
| parent | d084bc74832bdc7edb0a65805f51932edeef9fe7 (diff) | |
Schannel: Fix version functions
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.
Change-Id: I96b025a5a05c0bbb4db3d5ee68656e0df5f4eb07
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 76b0713d6ecd0dfb459b7c9e238b0928f92725d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/tls/schannel/qtls_schannel.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/tls/schannel/qtls_schannel.cpp b/src/plugins/tls/schannel/qtls_schannel.cpp index 83e9cb1c6c..2ba0651cba 100644 --- a/src/plugins/tls/schannel/qtls_schannel.cpp +++ b/src/plugins/tls/schannel/qtls_schannel.cpp @@ -210,7 +210,7 @@ long QSchannelBackend::tlsLibraryVersionNumber() const QString QSchannelBackend::tlsLibraryVersionString() const { 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(), QString::number(os.majorVersion()), QString::number(os.minorVersion()), @@ -219,16 +219,13 @@ QString QSchannelBackend::tlsLibraryVersionString() const long QSchannelBackend::tlsLibraryBuildVersionNumber() const { - return tlsLibraryVersionNumber(); + return NTDDI_VERSION; } QString QSchannelBackend::tlsLibraryBuildVersionString() const { - const auto os = QOperatingSystemVersion::current(); - return QString::fromLatin1("%1.%2.%3") - .arg(QString::number(os.majorVersion()), - QString::number(os.minorVersion()), - QString::number(os.microVersion())); + return QLatin1String("Secure Channel (NTDDI: 0x%1)") + .arg(QString::number(NTDDI_VERSION, 16).toUpper()); } void QSchannelBackend::ensureInitialized() const |