diff options
Diffstat (limited to 'src/network/doc/src/ssl.qdoc')
| -rw-r--r-- | src/network/doc/src/ssl.qdoc | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index c3e56a8734..83549f61e8 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page ssl.html @@ -37,13 +13,16 @@ the \l{OpenSSL Toolkit}, or any appropriate TLS plugin to perform encryption and protocol handling. - From Qt version 5.15 onwards, the officially supported version for OpenSSL + From Qt version 5.15 onward, the officially supported version for OpenSSL is 1.1.1 or later. + Qt version 5.15.1 onward is also compatible with OpenSSL 3. + \annotatedlist ssl + For Android applications see \l{Adding OpenSSL Support for Android}. - \section1 Enabling and Disabling SSL Support + \section1 Enabling and Disabling SSL Support when Building Qt from Source When building Qt from source, Qt builds plugins for native TLS libraries that are supported for the operating system you are building for. For |