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>
This commit is contained in:
Jake Petroules 2016-09-13 16:02:18 -07:00
parent eecc5fc52c
commit 6bceb4a8a9

View File

@ -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()