diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-28 13:59:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-09-29 12:36:27 +0000 |
| commit | e22bf03e23e0a3c3f4da494b7d527630f84a0469 (patch) | |
| tree | 2a93d71db3dcadb5a7fc11f4340379975d8e9a53 /src/network/ssl | |
| parent | 7c7595e1b298a1666056c03f042ec7a4a0aedafe (diff) | |
Qt Network: Remove code for Windows < 7
Change-Id: I21b93b8d550f4a1f3e26d5d516886c76b2364e7b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket_opensslpre11.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp index e51888c5f2..8ad4d5b521 100644 --- a/src/network/ssl/qsslsocket_opensslpre11.cpp +++ b/src/network/ssl/qsslsocket_opensslpre11.cpp @@ -290,8 +290,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() //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 ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) - s_loadRootCertsOnDemand = true; + s_loadRootCertsOnDemand = true; #endif } |