diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2011-11-14 12:33:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-16 10:32:10 +0100 |
| commit | 4dc390e66fefc850cf84292549285a359e2ad8e6 (patch) | |
| tree | dfc39a2b1e83826ad959a48ec9d7345db1ab3383 /src/network/ssl/qssl.h | |
| parent | e2628ef943f5787da92e737ce259db0750154ef7 (diff) | |
SSL namespace: rename TlsV1 to TlsV1_0
This is a source-incompatible change.
TlsV1 is ambiguous; what is actually meant is TLS version 1.0. There are
also TLS versions 1.1 and 1.2; we might want to add options for these
once OpenSSL supports them (apparently they will be with OpenSSL version
1.0.1).
Change-Id: I940d020b181b5fa528788ef0c3c47e8ef873796a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/ssl/qssl.h')
| -rw-r--r-- | src/network/ssl/qssl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index e6e4e5426d..0793a84671 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -81,7 +81,10 @@ namespace QSsl { enum SslProtocol { SslV3, SslV2, - TlsV1, // ### Qt 5: rename to TlsV1_0 or so + TlsV1_0, +#if QT_DEPRECATED_SINCE(5,0) + TlsV1 = TlsV1_0, +#endif AnyProtocol, TlsV1SslV3, SecureProtocols, |