summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-09-13 16:02:18 -0700
committerJake Petroules <jake.petroules@qt.io>2016-09-15 18:23:19 +0000
commit6bceb4a8a9292ce9f062a38d6fe143460b54370e (patch)
tree23d4c984e541627a6b59b7e011e20a3cfc48a220 /src/network
parenteecc5fc52c919d6607e610d858c2749977a1ef75 (diff)
Make QSslSocketPrivate::sslLibraryVersionString consistent on Windows
The returned string is now more similar to what the Apple (macOS, iOS, tvOS, watchOS) version returns, and helps prepare for a later patch that removes usages of QSysInfo::windowsVersion(). Change-Id: I5ba2937b27169ffc6624ccb4e608e6ff56a179bb Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qsslsocket_winrt.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index f5dc9fcdcd..ca65f8a015 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -181,13 +181,7 @@ long QSslSocketPrivate::sslLibraryVersionNumber()
QString QSslSocketPrivate::sslLibraryVersionString()
{
- switch (QSysInfo::windowsVersion()) {
- case QSysInfo::WV_WINDOWS8_1:
- return QStringLiteral("Windows Runtime 8.1 SSL library");
- default:
- break;
- }
- return QStringLiteral("Windows Runtime SSL library");
+ return QStringLiteral("Windows Runtime, ") + QSysInfo::prettyProductName();
}
long QSslSocketPrivate::sslLibraryBuildVersionNumber()