1 files changed, 47 insertions, 45 deletions

diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index 3c0415a2e4..e52b8c6361 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -1,62 +1,35 @@
-/****************************************************************************
-**
-** 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.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #ifndef QSSL_H
 #define QSSL_H
 
+#if 0
+#pragma qt_class(QSsl)
+#endif
+
 #include <QtNetwork/qtnetworkglobal.h>
+#include <QtCore/qobjectdefs.h>
 #include <QtCore/QFlags>
 
 QT_BEGIN_NAMESPACE
 
 
 namespace QSsl {
+    Q_NAMESPACE_EXPORT(Q_NETWORK_EXPORT)
+
     enum KeyType {
         PrivateKey,
         PublicKey
     };
+    Q_ENUM_NS(KeyType)
 
     enum EncodingFormat {
         Pem,
         Der
     };
+    Q_ENUM_NS(EncodingFormat)
 
     enum KeyAlgorithm {
         Opaque,
@@ -65,26 +38,28 @@ namespace QSsl {
         Ec,
         Dh,
     };
+    Q_ENUM_NS(KeyAlgorithm)
 
     enum AlternativeNameEntryType {
         EmailEntry,
         DnsEntry,
         IpAddressEntry
     };
+    Q_ENUM_NS(AlternativeNameEntryType)
 
     enum SslProtocol {
-        TlsV1_0,
-        TlsV1_1,
+        TlsV1_0 QT_DEPRECATED_VERSION_X_6_3("Use TlsV1_2OrLater instead."),
+        TlsV1_1 QT_DEPRECATED_VERSION_X_6_3("Use TlsV1_2OrLater instead."),
         TlsV1_2,
         AnyProtocol,
         SecureProtocols,
 
-        TlsV1_0OrLater,
-        TlsV1_1OrLater,
+        TlsV1_0OrLater QT_DEPRECATED_VERSION_X_6_3("Use TlsV1_2OrLater instead."),
+        TlsV1_1OrLater QT_DEPRECATED_VERSION_X_6_3("Use TlsV1_2OrLater instead."),
         TlsV1_2OrLater,
 
-        DtlsV1_0,
-        DtlsV1_0OrLater,
+        DtlsV1_0 QT_DEPRECATED_VERSION_X_6_3("Use DtlsV1_2OrLater instead."),
+        DtlsV1_0OrLater QT_DEPRECATED_VERSION_X_6_3("Use DtlsV1_2OrLater instead."),
         DtlsV1_2,
         DtlsV1_2OrLater,
 
@@ -93,6 +68,7 @@ namespace QSsl {
 
         UnknownProtocol = -1
     };
+    Q_ENUM_NS(SslProtocol)
 
     enum SslOption {
         SslOptionDisableEmptyFragments = 0x01,
@@ -104,6 +80,7 @@ namespace QSsl {
         SslOptionDisableSessionPersistence = 0x40,
         SslOptionDisableServerCipherPreference = 0x80
     };
+    Q_ENUM_NS(SslOption)
     Q_DECLARE_FLAGS(SslOptions, SslOption)
 
     enum class AlertLevel {
@@ -111,6 +88,7 @@ namespace QSsl {
         Fatal,
         Unknown
     };
+    Q_ENUM_NS(AlertLevel)
 
     enum class AlertType {
         CloseNotify,
@@ -148,7 +126,31 @@ namespace QSsl {
         NoApplicationProtocol = 120,
         UnknownAlertMessage = 255
     };
-
+    Q_ENUM_NS(AlertType)
+
+    enum class ImplementedClass
+    {
+        Key,
+        Certificate,
+        Socket,
+        DiffieHellman,
+        EllipticCurve,
+        Dtls,
+        DtlsCookie
+    };
+    Q_ENUM_NS(ImplementedClass)
+
+    enum class SupportedFeature
+    {
+        CertificateVerification,
+        ClientSideAlpn,
+        ServerSideAlpn,
+        Ocsp,
+        Psk,
+        SessionTicket,
+        Alerts
+    };
+    Q_ENUM_NS(SupportedFeature)
 }
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QSsl::SslOptions)