summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-05-25 14:09:27 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-05-25 14:17:17 +0200
commit4a1a952571c18eef4bb3c1678fcd6eed54840a95 (patch)
tree1d37c6126bc01635b1b88e9483516952875d3c0e
parent6074480a2b5402bfeea53bf9aadce196c079a56b (diff)
Add documentation on bearer management.
Reviewed-by: owolff Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
-rw-r--r--doc/simulator.qdoc36
1 files changed, 34 insertions, 2 deletions
diff --git a/doc/simulator.qdoc b/doc/simulator.qdoc
index 117225e..b5bf232 100644
--- a/doc/simulator.qdoc
+++ b/doc/simulator.qdoc
@@ -35,6 +35,7 @@
\o \l{Simulating Messaging}
\o \l{Simulating Sensors}
\o \l{Testing Applications Using the Qt Mobility Service Framework}
+ \o \l{Using Bearer Management}
\o \l{Interacting with Applications}
\o \l{Checking Application Layout}
\o \l{Scripting}
@@ -948,7 +949,7 @@
\contentspage index.html
\previouspage simulator-sensors.html
\page simulator-serviceframework.html
- \nextpage simulator-application.html
+ \nextpage simulator-bearermanagement.html
\title Testing Applications Using the Qt Mobility Service Framework
@@ -975,7 +976,7 @@
/*!
\contentspage index.html
- \previouspage simulator-serviceframework.html
+ \previouspage simulator-bearermanagement.html
\page simulator-application.html
\nextpage simulator-views.html
@@ -995,3 +996,34 @@
To quit the active application, click \gui Quit.
*/
+
+
+/*!
+ \contentspage index.html
+ \previouspage simulator-serviceframework.html
+ \page simulator-bearermanagement.html
+ \nextpage simulator-application.html
+
+ \title Using Bearer Management
+
+ The Bearer Management API controls the connectivity state
+ of the system and allows programs to start or stop interfaces or roam transparently
+ between access points.
+
+ The API was introduced in Qt Mobility 1.0.0 and will become a part of Qt 4.7. Qt Simulator
+ uses Qt 4.7, and therefore, you can use either the Qt 4.7 Network module or the
+ Qt Mobility 1.0.0 Bearer Management module in applications targeting the Qt Simulator.
+
+ For now we recommend using the Qt Mobility module by adding
+ \code
+ CONFIG += mobility
+ MOBILITY += bearer
+ \endcode
+ to the application pro file. This way, the application will compile for the Qt Simulator as
+ well as current devices.
+
+ The second way requires at least Qt 4.7 and is thus unavailable on current devices:
+ \code
+ QT += network
+ \endcode
+*/