summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-25 18:17:16 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-25 18:17:16 (GMT)
commitcf58c6bd5204edaff0a34bae5312798fc3700c94 (patch)
tree600e48add5404922ee866fe0bdf5f36340dfba39 /doc/src
parent2d89ee9cc302f7d381275a112e1c8a5de55ec286 (diff)
parentff8c63b4b40b26291f8847830e04f773dc1a1e71 (diff)
downloadQt-cf58c6bd5204edaff0a34bae5312798fc3700c94.zip
Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.gz
Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/qt4-intro.qdoc14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 91593d3..a18bc13 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -471,6 +471,20 @@
\tableofcontents
+ \section1 Declarative UI development with Qt Quick
+
+ \section1 Network Bearer Management
+
+ Bearer Management controls the connectivity state of the system.
+ The new Bearer Management API in the QtNetwork module allows the
+ application to identify whether the system is online and how many
+ interfaces there are, as well as start and stop interfaces, or
+ roam transparently between access points.
+
+ QNetworkAccessManager uses this API for HTTP level roaming.
+
+ \section1 Multimedia - playback and playlist management
+
\section1 New Classes, Functions, Macros, etc.
Links to new classes, functions, macros, and other items