summaryrefslogtreecommitdiffstats
path: root/src/network/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/doc/src')
-rw-r--r--src/network/doc/src/bearermanagement.qdoc2
-rw-r--r--src/network/doc/src/network-programming.qdoc25
-rw-r--r--src/network/doc/src/qtnetwork.qdoc31
3 files changed, 12 insertions, 46 deletions
diff --git a/src/network/doc/src/bearermanagement.qdoc b/src/network/doc/src/bearermanagement.qdoc
index f8d6a807d2..8aec894269 100644
--- a/src/network/doc/src/bearermanagement.qdoc
+++ b/src/network/doc/src/bearermanagement.qdoc
@@ -31,6 +31,8 @@
\title Bearer Management
\brief An API to control the system's connectivity state.
+\warning Bearer management is deprecated and will be removed in Qt 6.0.
+
Bearer Management controls the connectivity state of the system so that
the user can start or stop interfaces or roam transparently between
access points.
diff --git a/src/network/doc/src/network-programming.qdoc b/src/network/doc/src/network-programming.qdoc
index ce99af034b..654227f971 100644
--- a/src/network/doc/src/network-programming.qdoc
+++ b/src/network/doc/src/network-programming.qdoc
@@ -261,29 +261,4 @@
by passing a factory to QNetworkProxyFactory::setApplicationProxyFactory()
and a custom proxying policy can be created by subclassing
QNetworkProxyFactory; see the class documentation for details.
-
- \section1 Bearer Management Support
-
- Bearer Management controls the connectivity state of the device such that
- the application can start or stop network interfaces and roam
- transparently between access points.
-
- The QNetworkConfigurationManager class manages the list of network
- configurations known to the device. A network configuration describes the
- set of parameters used to start a network interface and is represented by
- the QNetworkConfiguration class.
-
- A network interface is started by openning a QNetworkSession based on a
- given network configuration. In most situations creating a network session
- based on the platform specified default network configuration is
- appropriate. The default network configuration is returned by the
- QNetworkConfigurationManager::defaultConfiguration() function.
-
- On some platforms it is a platform requirement that the application open a
- network session before any network operations can be performed. This can be
- tested by the presents of the
- QNetworkConfigurationManager::NetworkSessionRequired flag in the value
- returned by the QNetworkConfigurationManager::capabilities() function.
-
- \sa {Bearer Management}
*/
diff --git a/src/network/doc/src/qtnetwork.qdoc b/src/network/doc/src/qtnetwork.qdoc
index c931a1c19f..57b0210b7f 100644
--- a/src/network/doc/src/qtnetwork.qdoc
+++ b/src/network/doc/src/qtnetwork.qdoc
@@ -34,19 +34,16 @@
TCP/IP. Operations such as requests, cookies, and sending data over HTTP
are handled by various C++ classes.
- \section1 Getting Started
+ \include module-use.qdocinc using qt module
+ \snippet CMakeLists.txt 0
- To use Qt Network classes,add this directive into the C++ files:
- \code
- #include <QtNetwork>
- \endcode
+ See also the \l{Build with CMake} overview.
- \if !defined(qtforpython)
- To link against the Qt Network module, add this line to the project file:
- \code
- QT += network
- \endcode
- \endif
+ \section2 Building with qmake
+
+ Add \c network to the \c QT variable:
+
+ \snippet snippets.pro 0
\section1 Articles and Guides
@@ -54,7 +51,6 @@
applications with networking capabilities.
\list
\li \l{Network Programming with Qt} - Programming applications with networking capabilities
- \li \l{Bearer Management} - An API to control the system's connectivity state
\li \l{Secure Sockets Layer (SSL) Classes} - Classes for secure communication over network sockets
\endlist
@@ -101,13 +97,6 @@
\qtvariable network
\brief Provides classes to make network programming easier and portable.
- To include the definitions of the module's classes, use the
- following directive:
-
- \snippet code/doc_src_qtnetwork.cpp 1
-
- To link against the module, add this line to your \l qmake \c
- .pro file:
-
- \snippet code/doc_src_qtnetwork.pro 0
+ Qt Network provides a set of APIs for programming applications that use
+ TCP/IP. See the \l{Qt Network} overview for more information.
*/