diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 10:11:49 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:48:52 +0200 |
| commit | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (patch) | |
| tree | f1643f829aedc9ac51fcc260f7df2639dfe08360 /src/network/ssl/qssl.h | |
| parent | 17f3451daa286b88a52f18c802d7b158dfb653b2 (diff) | |
| parent | bdc417b3828737334723eae23097c85f70c23a33 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h
Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
Diffstat (limited to 'src/network/ssl/qssl.h')
| -rw-r--r-- | src/network/ssl/qssl.h | 6 |
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, |