From 43983b0b6fe2ca0d6f42edcec19115fb16753b75 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 2 Sep 2019 16:45:00 +0200 Subject: Remove QOperatingSystemVersion::WindowsVista The minimum supported version is Windows 7. Remove QOperatingSystemVersion::WindowsVista added by b0cd007335853f283c47ffb0f5611d14e6dbe84b and replace with "true" wherever it was used. Change-Id: I08c0208467b655a921b6773f77d8bc099be69031 Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/network/ssl/qsslsocket_openssl11.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/network/ssl/qsslsocket_openssl11.cpp') diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp index 28be4f2e79..1d935c5217 100644 --- a/src/network/ssl/qsslsocket_openssl11.cpp +++ b/src/network/ssl/qsslsocket_openssl11.cpp @@ -143,13 +143,12 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() if (!s_loadRootCertsOnDemand) setDefaultCaCertificates(systemCaCertificates()); #ifdef Q_OS_WIN - //Enabled for fetching additional root certs from windows update on windows 6+ + //Enabled for fetching additional root certs from windows update on windows. //This flag is set false by setDefaultCaCertificates() indicating the app uses //its own cert bundle rather than the system one. //Same logic that disables the unix on demand cert loading. //Unlike unix, we do preload the certificates from the cert store. - if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::WindowsVista) - s_loadRootCertsOnDemand = true; + s_loadRootCertsOnDemand = true; #endif } -- cgit v1.2.3