summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qssl.h
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-08-03 18:36:55 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-04 16:13:33 +0200
commit8ef86d05f199ebab216da43d5e0a9dc322b657b3 (patch)
treeea8fac9adf6ce41b530bdb2bc6f4b79010f871f9 /src/network/ssl/qssl.h
parent69d6012de469185aa70c86fec69fcb908acfde0c (diff)
QSslCertificate: deprecate alternateSubjectNames()
... and add a new method subjectAlternativeNames() instead. This was a typo in the API. Change-Id: Id8704c387c9ff8e1af2b9a524ff628f5c053a294 Reviewed-on: http://codereview.qt.nokia.com/2618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/network/ssl/qssl.h')
-rw-r--r--src/network/ssl/qssl.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index 2ecd1c363c..7b76b64b4c 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -67,11 +67,15 @@ namespace QSsl {
Dsa
};
- enum AlternateNameEntryType {
+ enum AlternativeNameEntryType {
EmailEntry,
DnsEntry
};
+#if QT_DEPRECATED_SINCE(5,0)
+ typedef AlternativeNameEntryType AlternateNameEntryType;
+#endif
+
enum SslProtocol {
SslV3,
SslV2,