diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-11 16:02:16 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-13 08:24:49 +0100 |
| commit | 38f38c718895ba01a79c823a2ace6d9f27e12e85 (patch) | |
| tree | 5afb15a08dc323d3340e9ab875fa568d7a25a121 /src/network/ssl | |
| parent | 2f81ad9d746a4949d7fd76e2aa26c2281fac5d53 (diff) | |
Deprecate enumerators fro SSL v.2 and v.3 protocols
And we'll get rid of them in Qt 6.
Task-number: QTBUG-75638
Change-Id: I34764f93bf579da0640a930d9160783ea9c8317d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qssl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index 42c7b5c56d..4ca90cc8c5 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -77,9 +77,11 @@ namespace QSsl { #endif enum SslProtocol { +#if QT_DEPRECATED_SINCE(5, 15) SslV3, SslV2, - TlsV1_0, +#endif + TlsV1_0 = 2, #if QT_DEPRECATED_SINCE(5,0) TlsV1 = TlsV1_0, #endif |