AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document Qt Network licenses

Browse Source 
Also explicitly mention the GPL exception for OpenSSL.

Change-Id: I460189ee4d2dd79f8eca320ac82460e186b0f84c
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
This commit is contained in:
Kai Koehne 2016-10-20 13:26:36 +02:00
parent 71d4aea646
commit 398d67198c
3 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/network/doc/src/external-resources.qdoc Normal file
View File

@ -0,0 +1,36 @@
/****************************************************************************
**
** 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$
**
****************************************************************************/
/*!
\externalpage https://www.openssl.org/
\title OpenSSL Toolkit
*/
/*!
\externalpage https://www.openssl.org/source/license.html
\title OpenSSL License
*/

30
src/network/doc/src/qtnetwork.qdoc
View File

@ -60,7 +60,37 @@
\list
\li \l{Qt Network C++ Classes}{C++ Classes}
\endlist
\section1 Licenses and Attributions
Qt Network is available under commercial licenses from \l{The Qt Company}.
In addition, it is available under the
\l{GNU Lesser General Public License, version 3}, or
the \l{GNU General Public License, version 2}.
See \l{Qt Licensing} for further details.
Qt Network can use the \l{OpenSSL Toolkit} as a backend. The library is then
linked against OpenSSL in a way that requires compliance with the \l{OpenSSL
License}. To allow linking OpenSSL with Qt Network under the GPL, following
exceptions to the GPL do apply:
\badcode
In addition, as a special exception, the copyright holders listed above give
permission to link the code of its release of Qt with the OpenSSL project's
"OpenSSL" library (or modified versions of the "OpenSSL" library that use the
same license as the original version), and distribute the linked executables.
You must comply with the GNU General Public License version 2 in all
respects for all of the code used other than the "OpenSSL" code. If you
modify this file, you may extend this exception to your version of the file,
but you are not obligated to do so. If you do not wish to do so, delete
this exception statement from your version of this file.
\endcode
Also note shipping OpenSSL might cause \l{Import and Export Restrictions}
to apply.
*/
/*!
\module QtNetwork
\title Qt Network C++ Classes

9
src/network/doc/src/ssl.qdoc
View File

@ -33,7 +33,7 @@
\keyword SSL
The classes below provide support for secure network communication using
the Secure Sockets Layer (SSL) protocol, using the OpenSSL Toolkit (\l{http://www.openssl.org/})
the Secure Sockets Layer (SSL) protocol, using the \l{OpenSSL Toolkit}
to perform encryption and protocol handling.
From Qt version 5.2 onwards, the officially supported version for OpenSSL
@ -67,16 +67,13 @@
To disable SSL support in a Qt build, configure Qt with the \c{-no-openssl}
option.
\section1 Licensing Information
\section1 Import and Export Restrictions
\note Due to import and export restrictions in some parts of the world, we
Due to import and export restrictions in some parts of the world, we
are unable to supply the OpenSSL Toolkit with Qt packages. Developers wishing
to use SSL communication in their deployed applications should either ensure
that their users have the appropriate libraries installed, or they should
consult a suitably qualified legal professional to ensure that applications
using code from the OpenSSL project are correctly certified for import
and export in relevant regions of the world.
When the Qt Network module is built with SSL support, the library is linked
against OpenSSL in a way that requires OpenSSL license compliance.
*/