summaryrefslogtreecommitdiffstats
path: root/src/network/doc/src/qtnetwork.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/doc/src/qtnetwork.qdoc')
-rw-r--r--src/network/doc/src/qtnetwork.qdoc70
1 files changed, 30 insertions, 40 deletions
diff --git a/src/network/doc/src/qtnetwork.qdoc b/src/network/doc/src/qtnetwork.qdoc
index e18bcd3148..629c7113db 100644
--- a/src/network/doc/src/qtnetwork.qdoc
+++ b/src/network/doc/src/qtnetwork.qdoc
@@ -1,57 +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$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
\page qtnetwork-index.html
\title Qt Network
\brief Provides networking capabilities
- Qt Network provides a set of APIs for programming applications that use
- TCP/IP. Operations such as requests, cookies, and sending data over HTTP
- are handled by various C++ classes.
+ The Qt Network module provides a set of APIs for programming
+ applications that use TCP/IP. Operations such as requests, cookies, and
+ sending data over HTTP are handled by various C++ classes.
- \include module-use.qdocinc using qt module
- \snippet doc/snippets/CMakeLists.txt 0
+ \section1 Using the Module
- See also the \l{Build with CMake} overview.
+ \include {module-use.qdocinc} {using the c++ api}
- \section2 Building with qmake
+ \section2 Building with CMake
+
+ \include {module-use.qdocinc} {building with cmake} {Network}
- Add \c network to the \c QT variable:
+ \section2 Building with qmake
- \snippet doc/snippets/snippets.pro 0
+ \include {module-use.qdocinc} {building_with_qmake} {network}
\section1 Articles and Guides
These articles contain information about Qt Network setup and about
applications with networking capabilities.
\list
- \li \l{Network Programming with Qt} - Programming applications with networking capabilities
- \li \l{Secure Sockets Layer (SSL) Classes} - Classes for secure communication over network sockets
+ \li \l{Network Programming with Qt} - Programming applications with
+ networking capabilities
+ \li \l{Secure Sockets Layer (SSL) Classes} - Classes for secure
+ communication over network sockets
\endlist
\section1 API Reference
@@ -60,6 +39,10 @@
\li \l{Qt Network C++ Classes}{C++ Classes}
\endlist
+ \section1 Module Evolution
+ \l{Changes to Qt Network} lists important changes in the module API
+ and functionality that were done for the Qt 6 series of Qt.
+
\section1 Licenses and Attributions
Qt Network is available under commercial licenses from \l{The Qt Company}.
@@ -68,7 +51,13 @@
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
+ Furthermore, Qt Network in Qt \QtVersion may contain third-party
+ modules under the following permissive licenses:
+
+ \generatelist{groupsbymodule attributions-qtnetwork}
+
+ Qt Network can make use of the \l{OpenSSL Toolkit} as a back end.
+ 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:
@@ -98,6 +87,7 @@
\qtvariable network
\brief Provides classes to make network programming easier and portable.
- Qt Network provides a set of APIs for programming applications that use
- TCP/IP. See the \l{Qt Network} overview for more information.
+
+ The \l{Qt Network} page contains information about how to use the module.
+
*/