From 6bceb4a8a9292ce9f062a38d6fe143460b54370e Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 13 Sep 2016 16:02:18 -0700 Subject: 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 Reviewed-by: Oliver Wolff --- src/network/ssl/qsslsocket_winrt.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/network') 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() -- cgit v1.2.3