Merge branch '1.0' of ../../mainline/qtmobility into 1.0

author: David Laing <david.laing@nokia.com> 2010-04-21 15:31:41 +1000
committer: David Laing <david.laing@nokia.com> 2010-04-21 15:31:41 +1000
commit: d82a6d7a5877982d336bb69343bc010e0529a38f (patch)
tree: fa6e85173abf5d4e174b19dc36a8030be416ad9f /doc/src
parent: 932cf5f6557b4269db28b26272e77744c45c7ea9 (diff)
parent: fe9f8470f3cb6f63072845039b071ae1030403fc (diff)
4 files changed, 33 insertions, 12 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 11b91f59a0..d52bcdb765 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -219,7 +219,7 @@
     sensors such as screen orientation (portrait, landscape) and low-level,
     real-time sensors such as accelerometer data.
 
-    For more details see the \l{Sensors API (beta)}{Sensors API overview}.
+    For more details see the \l{Sensors API}{Sensors API overview}.
 
     \section2 Service Framework
 
@@ -343,7 +343,7 @@
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
-    <td bgcolor="green"></td>
+    <td bgcolor="yellow"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
@@ -379,7 +379,7 @@
     <td bgcolor="green"></td>
     </tr>
     <tr>
-    <td>Contacts</td>
+    <td>Contacts*</td>
 
     <td>FINAL</td>
     <td bgcolor="yellow"></td>
@@ -407,7 +407,7 @@
     <td bgcolor="green"></td>
     </tr>
     <tr>
-    <td>Multimedia</td>
+    <td>Multimedia**</td>
     <td>BETA</td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
@@ -435,8 +435,8 @@
     <td bgcolor="green"></td>
     </tr>
     <tr>
-    <td>Sensors</td>
-    <td>BETA</td>
+    <td>Sensors*</td>
+    <td>FINAL</td>
     <td bgcolor="yellow"></td>
     <td bgcolor="lightgray"></td>
     <td bgcolor="lightgray"></td>
@@ -470,6 +470,15 @@
 
     \endraw
 
+    [*] \i {These APIs are considered FINAL however there are some known
+    issues with Symbian backends. These backend issues will be resolved
+    in a future release. }
+    \raw HTML
+    <p>
+    \endraw
+    [**] \i {These APIs are considered BETA pending final API reviews. We
+    anticipate moving the status to Final in a future release.}
+
     \section1 Feedback and bug reports
     Email any inquiries and feedback about Qt Mobility to qt-mobility-feedback@trolltech.com
 
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 90c55228cf..b89f64b1f0 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -126,7 +126,7 @@ these domains have dependencies and these are outlined below:
        The gstengine plugin for Linux and Maemo depends on gstreamer-0.10 (>= 0.10.19), gstreamer-audio-0.10 (>= 0.10.19), gstreamer-base-0.10 (>= 0.10.19), gstreamer-interfaces-0.10 (>= 0.10.19) and gstreamer-video-0.10 (>= 0.10.19).
        If asound (auto-detected) is available, ALSA device detection will be enabled.
 
-       The QtMobilityMultimediaEngine for Symbian depends on QtMultimedia. 
+       The mmf plugin for Symbian depends on QtMultimedia. 
        To enable all mediaservices on symbian one must download sdk plugins. Sdk plugins are available at \l http://wiki.forum.nokia.com/index.php/SDK_API_Plug-in
        For 5th edition sdk plugins are installed with installer (all at once), but for FP1 and FP2 devices a zip is provided. You will need following plugins to compile all features: 
        MediaPlayerEngine (MediaPlayerUtilityAPI for 3rd FP2), AudioRoutingAPI , Tuner Utility (only for 3rd FP1) Radio Utility API (for 3rd FP2 and 5th ed).
@@ -140,6 +140,16 @@ these domains have dependencies and these are outlined below:
     \o Y
     \o N
 \row
+    \o  Sensors
+    \o  The QtSensors s60_sensor_api plugin for S60 3.1 depends on the \l {http://www.forum.nokia.com/info/sw.nokia.com/id/4284ae69-d37a-4319-bdf0-d4acdab39700/Sensor_plugin_S60_3rd_ed.html}{Sensor API Plug-in}
+    \o  Y
+    \o  N
+\row
+    \o
+    \o  The QtSensors symbian plugin for S60 3.2 depends on the backported \l {http://www.forum.nokia.com/info/sw.nokia.com/id/8059e8ae-8c22-4684-be6b-d40d443d7efc/Sensor_API_Plug_in_S60_3rd_FP2.html}{Sensor API Plug-in}
+    \o  Y
+    \o  N
+\row
     \o  Service Framework
     \o  On all platforms, QtServiceFramework depends on QtSql. QtSql also needs the SQLite 3 driver (enabled by default) at runtime.
     \o  N
diff --git a/doc/src/qtmobility-known-issues.qdoc b/doc/src/qtmobility-known-issues.qdoc
index 298612c536..d52dd678a4 100644
--- a/doc/src/qtmobility-known-issues.qdoc
+++ b/doc/src/qtmobility-known-issues.qdoc
@@ -141,9 +141,9 @@ Support is present for the following System Info API classes
 
 \section2 Non-API specific issues
 \list
-    \o Qt Mobility does not compile if Qt using a namespace
-    \o Not all example applications will display(fit) well on small screens
-    \o On S60, it is currently not possible to use Qt convenience header includes:
+    \o Qt Mobility does not compile if Qt using a namespace.
+    \o Not all example applications will display(fit) well on small screens.
+    \o S60: it is currently not possible to use Qt convenience header includes:
     \code
         #include <QSystemInfo> //does not work on Symbian
         //use
@@ -155,6 +155,7 @@ Support is present for the following System Info API classes
 \list
     \o S60: Async contact operations not supported
     \o S60: Extending contact fields at runtime is not supported on most Symbian platforms because would compromise compatibility with the S60 platform Phonebook application.
+    \o S60 3.1: the Symbian contacts plugins are not loaded on a device.
 \endlist
 
 \section2 Messaging API
@@ -196,7 +197,8 @@ Support is present for the following System Info API classes
 
 \section2 Sensors API
 \list
-    \o \bold {Sensors API is in beta state.}
+    \o S60: The S60 sensor backends are under development and may not be complete.
+    \o S60 3.1: src/s60installs/s60installs.pro: the s60_sensor_api plugin for 3.1 devices is not added to the sis file when generating the sis file for multiple SDKs.
 \endlist
 
 \section2 System Info API
diff --git a/doc/src/sensors.qdoc b/doc/src/sensors.qdoc
index 8691f3a4e8..8184ee9d19 100644
--- a/doc/src/sensors.qdoc
+++ b/doc/src/sensors.qdoc
@@ -41,7 +41,7 @@
 
 /*!
 \page sensors-api.html
-\title Sensors API (beta)
+\title Sensors API
 \brief The Sensors API provides access to sensors.
 \ingroup mobility
author	David Laing <david.laing@nokia.com>	2010-04-21 15:31:41 +1000
committer	David Laing <david.laing@nokia.com>	2010-04-21 15:31:41 +1000
commit	d82a6d7a5877982d336bb69343bc010e0529a38f (patch)
tree	fa6e85173abf5d4e174b19dc36a8030be416ad9f /doc/src
parent	932cf5f6557b4269db28b26272e77744c45c7ea9 (diff)
parent	fe9f8470f3cb6f63072845039b071ae1030403fc (diff)