Merge branch 'master' of ../qtmobility

19 files changed, 523 insertions, 109 deletions

diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index 480eda366d..5aa15148b5 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -5,7 +5,7 @@ HTML.postheader = \
     "    <div class=\"content\"> \n" \
     "    <div id=\"nav-logo\">\n" \
     "      <a href=\"index.html\">Home</a></div>\n" \
-    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Mobility Reference Documentation</span></a>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>QtMobility Reference Documentation</span></a>\n" \
     "    <div id=\"narrowsearch\"></div>\n" \
     "    <div id=\"nav-topright\">\n" \
     "      <ul>\n" \
@@ -19,7 +19,7 @@ HTML.postheader = \
     "    </div>\n" \
     "    <div id=\"shortCut\">\n" \
     "      <ul>\n" \
-    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Mobility 1.2</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">QtMobility 1.2</a></span></li>\n" \
     "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
     "        </a></li>\n" \
     "      </ul>\n" \
diff --git a/doc/config/qtmobility.qdocconf b/doc/config/qtmobility.qdocconf
index 75fba31d31..73e013a80c 100644
--- a/doc/config/qtmobility.qdocconf
+++ b/doc/config/qtmobility.qdocconf
@@ -1,2 +1,3 @@
+include (qtmobility-online.qdocconf)
 include(qtmobility-project.qdocconf)
 include(qt-html-templates.qdocconf)
diff --git a/doc/config/style/style.css b/doc/config/style/style.css
index af16d41e70..aee7eaf42f 100644
--- a/doc/config/style/style.css
+++ b/doc/config/style/style.css
@@ -177,17 +177,52 @@
      /*   background-color: #E6E6E6;*/ /* disabled until further notice */
     }
             
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
     span.comment
     {
-        color: #8B0000;
-        font-style: italic;
+        color: #008B00;
+        font-style: italic
     }
     span.string, span.char
     {
-        color: #254117;
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
     }
-
-
 /* end basic elements */
 
 /* font style elements */
diff --git a/doc/src/examples/declarative-location-flickr.qdoc b/doc/src/examples/declarative-location-flickr.qdoc
index 36b9967461..5c7c1d4856 100644
--- a/doc/src/examples/declarative-location-flickr.qdoc
+++ b/doc/src/examples/declarative-location-flickr.qdoc
@@ -30,7 +30,9 @@
     \title Declarative Location Flickr
 
     This example illustrates the positioning elements of declarative location.
-    
+
+    \image  qml-flickr-1.png
+
     The basic idea is to fetch public images from the Flickr service based on
     your current location. In case there is no default positioning provider on the platform
     the application is being run on, the example defaults to use a small NMEA log file
diff --git a/doc/src/images/qml-flickr-1.png b/doc/src/images/qml-flickr-1.png
new file mode 100644
index 0000000000..f3ac334499
--- /dev/null
+++ b/doc/src/images/qml-flickr-1.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index f21d599847..b1cb92525c 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -337,7 +337,7 @@
     These platforms are not currently under active development or QA. Contributions to these platforms are welcome.
     <br />
     <br />
-    <table align="center" cellpadding="2" cellspacing="1" border="1" rules="all">
+    <table align="center" cellpadding="2" cellspacing="1" border="1" rules="all" width="90%">
     <tbody>
     <tr>
     <td rowspan="2">&nbsp;</td>
@@ -442,7 +442,7 @@
     <td bgcolor="green"></td>
     </tr>
     <tr>
-    <td>Multimedia</td>QtMobility Bearer does not support MeeGo. Use Qt 4.7 based Bearer API instead.
+    <td>Multimedia</td>
     <td>FINAL</td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
@@ -457,7 +457,7 @@
     </tr>
     <tr>
     <td>System Information</td>
-    <td>FINAL</td>QtMobility Bearer does not support MeeGo. Use Qt 4.7 based Bearer API instead.
+    <td>FINAL</td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
     <td bgcolor="green"></td>
diff --git a/doc/src/location.qdoc b/doc/src/location.qdoc
index 4f83c6e0d2..135e4b2d68 100644
--- a/doc/src/location.qdoc
+++ b/doc/src/location.qdoc
@@ -245,6 +245,11 @@ that is received by \c ClientApplication.
 Before running the example, make sure you have done both \tt make
 and \tt {make install}.
 
+\section2 QML Elements
+
+For details on the QML support provided for the Location API see the documentation for the
+\l {Location QML Plugin}.
+
 \section2 Examples
 
 \section3 \bold{Flickr Demo}
@@ -260,10 +265,26 @@ weather for the current location.
 The \l{lightmaps}{Light Maps demo} uses Location display a street map for
 the current location.
 
+\section2 QML Example
+
+Examples using the Location QML Plugin demonstrate how to use the QML/C++
+bindings to easily access the Location API features.
+
+\section3 \bold{Flickr QML Example}
+The Flickr example now in the form of a QML application. This also displays
+in the form of a mobile application.
+
+
 \section2 Location classes
 
 \annotatedlist location
 
+
+
+
+
+
+
 \target Landmarks
 \section1 Landmarks
 The Landmarks portion of the Location API facilitates the creation,
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index 7740dbafff..570a72a3d3 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -180,7 +180,11 @@ hue, saturation and full screen mode.
     player->play();
 \endcode
 
-The \l {player}{Player} example does things a bit differently to our sample code. Instead of using a QVideoWidget object directly, the Player example has a \i {VideoWidget} class that inherits from QVideoWidget. This means that functions can be added to provide functions such as full screen display, either on a double click or on a particular keypress.
+The \l {player}{Player} example does things a bit differently to our sample
+code. Instead of using a QVideoWidget object directly, the Player example
+has a \i {VideoWidget} class that inherits from QVideoWidget. This means
+that functions can be added to provide functions such as full screen display,
+either on a double click or on a particular keypress.
 
 \snippet ../../demos/player/player.cpp  2
 
@@ -200,7 +204,8 @@ For the developer who wishes to extend the functionality of the Multimedia
 classes there are several classes of particular importance. The default
 classes are QMediaService, QMediaServiceProvider and QMediaControl.
 
-Basically, the idea is that to use the Multimedia API you would use these three classes or classes derived from them as follows
+Basically, the idea is that to use the Multimedia API you would use these
+three classes or classes derived from them as follows
 
     \list
     \o \l QMediaServiceProvider is used by the top level client class to request a service. The top level class knowing what kind of service it needs.
@@ -210,23 +215,42 @@ Basically, the idea is that to use the Multimedia API you would use these three
     \o \l QMediaControl allows the control of the service using a known interface.
     \endlist
 
-Consider a developer creating, for example, a media player class called MyPlayer. It may have special
-requirements beyond ordinary media players and so may need a custom service and a custom control. We can
-subclass \l QMediaServiceProvider to create our MyServiceProvider class. Also we will create a
+Consider a developer creating, for example, a media player class called MyPlayer.
+It may have special requirements beyond ordinary media players and so may
+need a custom service and a custom control. We can subclass \l QMediaServiceProvider
+to create our MyServiceProvider class. Also we will create a
 MyMediaService, and the MyMediaControl to manipulate the media service.
 
-The MyPlayer object calls MyServiceProvider::requestService() to get an instance of MyMediaService. Then the MyPlayer object calls this service object it has just received and calling \l {QMediaService::requestControl()}{requestControl()} it will receive the control object derived from QMediaControl. Now we have all the parts necessary for our media application. We have the service provider, the service it provides and the control used to manipulate the service. Since our MyPlayer object has instances of the service and its control then it would be possible for these to be used by associated classes that could do additional actions, perhaps with their own control since the parameter to requestControl() is a c-type string, \i {const char *}, for the interface.
+The MyPlayer object calls MyServiceProvider::requestService() to get an
+instance of MyMediaService. Then the MyPlayer object calls this service
+object it has just received and calling \l {QMediaService::requestControl()}{requestControl()}
+it will receive the control object derived from QMediaControl. Now we have
+all the parts necessary for our media application. We have the service
+provider, the service it provides and the control used to manipulate the
+service. Since our MyPlayer object has instances of the service and its
+control then it would be possible for these to be used by associated classes
+that could do additional actions, perhaps with their own control since the
+parameter to requestControl() is a c-type string, \i {const char *}, for the
+interface.
 
 
 \section2 Adding a Media Service Provider
 
-The base class for creating new service providers is \l{QMediaServiceProvider}. The user must implement the \l{QMediaServiceProvider::requestService()}{requestService()} function
+The base class for creating new service providers is \l{QMediaServiceProvider}.
+The user must implement the \l{QMediaServiceProvider::requestService()}{requestService()}
+function
 
 \code
     QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint);
 \endcode
 
-The details of implementation will depend on the provider. Looking at the class \l QMediaServiceProvider for the default implementation. Notice that \l {QMediaServiceProvider::requestService()}{requestService()} uses the \l QMediaServiceProviderHint to look for the appropriate plugin and then to insert it into the plugin map. However, for a specific service provider there is probably no need for this approach, it will simply depend on what the developer wants to implement.
+The details of implementation will depend on the provider. Looking at the
+class \l QMediaServiceProvider for the default implementation. Notice that
+\l {QMediaServiceProvider::requestService()}{requestService()} uses the
+\l QMediaServiceProviderHint to look for the appropriate plugin and then to
+insert it into the plugin map. However, for a specific service provider there
+is probably no need for this approach, it will simply depend on what the
+developer wants to implement.
 
 Other methods that may be overloaded
 \code
@@ -339,15 +363,15 @@ recognition, center focus and a custom focus where the focus point can be specif
 
 
 
-\section2 Cancelling Asynchronous Operations
+\section2 Canceling Asynchronous Operations
 
 Various operations such as image capture and auto focusing occur
 asynchrously. These operations can often be cancelled by the start of a new
 operation as long as this is supported by the backend. For image capture,
 the operation can be cancelled by calling
-\l {QCameraImageCapture::cancelCapture()}{cancelCapture()}. For AutoFocus,
-autoexposure or white balance cancellation can be done by calling
-\i {QCamera::unlock(QCamera::LockFocus)}.
+\l {QCameraImageCapture::cancelCapture()}{cancelCapture()}. For \l {QCameraFocus::FocusMode}{auto-focus},
+\l {QCameraExposure::ExposureMode}{auto-exposure} or \l {QCameraImageProcessing::WhiteBalanceMode}{white balance}
+cancellation can be done by calling \l {QCamera::unlock()}{unlock}(QCamera::LockFocus).
 
 
 
diff --git a/doc/src/organizer.qdoc b/doc/src/organizer.qdoc
index 0104c9add3..74749937c3 100644
--- a/doc/src/organizer.qdoc
+++ b/doc/src/organizer.qdoc
@@ -351,6 +351,5 @@ The following sample applications show examples of API usage:
 
 For details on the QML support provided for the Organizer API see the documentation for the \l {Organizer QML Plugin}.
 
-\note At the time of the QtMobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
 
 */
diff --git a/doc/src/plugins/qml-feedback.qdoc b/doc/src/plugins/qml-feedback.qdoc
index 89958b0ab4..07c6ddca0d 100644
--- a/doc/src/plugins/qml-feedback.qdoc
+++ b/doc/src/plugins/qml-feedback.qdoc
@@ -51,8 +51,6 @@
     The Feedback API allows application developers to implement feedback and programmatic vibration in their applications.
     Use this in the QML \i {import} statement.
 
-    \note At the time of the QtMobility 1.1 release the QML support for the Feedback API is incomplete and likely to be refined
-          and improved in the next patch release.
 
 
     \section1 Feedback elements
diff --git a/doc/src/plugins/qml-location.qdoc b/doc/src/plugins/qml-location.qdoc
index 3cae558dfb..5c5bc9d440 100644
--- a/doc/src/plugins/qml-location.qdoc
+++ b/doc/src/plugins/qml-location.qdoc
@@ -81,11 +81,8 @@
     by the Plugin element associated with the Map.
 
     Various map objects can be added to the map.  These map objects are
-    specified in terms of coordinates and metres.
+    specified in terms of coordinates and meters.
 
-    \note Maps and Navigation domain supports basic Map functionality, including
-    Map objects and basic mouse handling. Routing and searching are not yet
-    supported.
 
     \section2 Map Elements
 
diff --git a/doc/src/plugins/qml-organizer.qdoc b/doc/src/plugins/qml-organizer.qdoc
index 2e426d51e4..37dbcccc72 100644
--- a/doc/src/plugins/qml-organizer.qdoc
+++ b/doc/src/plugins/qml-organizer.qdoc
@@ -90,7 +90,6 @@
     \sa {OrganizerItem::isFloatingTime}.
 
     \section2 Organizer Elements
-    \note At the time of the QtMobility 1.1 release the QML support for the Organizer API is incomplete and likely to be refined and improved in the next patch release.
 
     \annotatedlist qml-organizer
 */
diff --git a/doc/src/qlandmarks.qdoc b/doc/src/qlandmarks.qdoc
index 93cac5dd76..dce77773e8 100644
--- a/doc/src/qlandmarks.qdoc
+++ b/doc/src/qlandmarks.qdoc
@@ -103,7 +103,7 @@ We may reuse the QLandmarkSaveRequest by setting another landmark and running \l
 To retrieve categories we simply make the appropriate call to the QLandmarkManager:
 \snippet snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp Retrieve categories synchronously
 
-When retrieiving categories we may do so by the category ids.  When the category data is needed
+When retrieving categories we may do so by the category ids.  When the category data is needed
 we may use the id to retrieve a category object:
 \snippet snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp Retrieve categories synchronously by id
 
@@ -160,7 +160,7 @@ To remove a category we simply pass the category id to a QLandmarkManager.
 
 \section3 \bold{Deleting a landmark}
 
-To remove a landmark we simply passs the landmark id to a QLandmarkManager.
+To remove a landmark we simply pass the landmark id to a QLandmarkManager.
 
 \snippet snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp Remove landmark synchronously
 
@@ -263,4 +263,26 @@ We may reuse the QLandmarkExportRequest by setting another filename and/or forma
 
 \snippet snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp Export landmarks asynchronously handler
 
+\section1 C++ Examples
+
+There are no C++ only, documented examples of the Landmarks API. However, there
+is the \l {Maps Demo Tutorial} which is C++ only, though being a tutorial it is
+longer and more complicated than an example.
+
+\section1 QML Examples
+
+\section2 \bold{Landmark Map QML Example}
+
+The \l {Landmark Map Example} shows how a mobile application might display
+some map information which includes landmark information imported from a landmark
+file.
+
+\section2 \bold{Map Viewer QML Example}
+
+The \l {Declarative Map Viewer Example}{Map Viewer example} displays a map of
+the current location or failing that a hard-coded default location to display
+a typical map navigation application in form typical of a mobile phone.
+
+
+
 */
diff --git a/doc/src/qt-html-templates.qdocconf b/doc/src/qt-html-templates.qdocconf
new file mode 100644
index 0000000000..a3f58cc9db
--- /dev/null
+++ b/doc/src/qt-html-templates.qdocconf
@@ -0,0 +1,145 @@
+HTML.stylesheets        =  style/style.css \
+                                    style/OfflineStyle.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style_ie6.css
+
+HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+			  "    <div class=\"content\"> \n" \
+			  "    <div id=\"nav-logo\">\n" \
+			  "      <a href=\"index.html\">Home</a></div>\n" \
+			  "    <a href=\"index.html\" class=\"qtref\"><span>QtMobility Reference Documentation</span></a>\n" \
+			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearchTop\">\n" \
+			  "		<fieldset>\n" \
+              "		<input type=\"text\" value=\"\" id=\"pageType2\" name=\"searchstring\"/>\n" \
+			  "		 </fieldset>\n" \
+			  "		</form></div>\n" \
+			  "    <div id=\"nav-topright\">\n" \
+			  "      <ul>\n" \
+			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+			  "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
+			  "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+			  "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+			  "          DOC</a></li>\n" \
+			  "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+			  "      </ul>\n" \
+			  "    </div>\n" \
+			  "    <div id=\"shortCut\">\n" \
+			  "      <ul>\n" \
+			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Mobility 1.2 BETA</a></span></li>\n" \
+			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
+			  "        </a></li>\n" \
+			  "      </ul>\n" \
+			  "     </div>\n" \
+			 " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+			"		 <li><a href=\"#\">API Lookup</a> \n" \
+			"			 <ul id=\"topmenuLook\"> \n" \
+			"			   <li><a href=\"classes.html\">Class index</a></li> \n" \
+			" 			  <li><a href=\"functions.html\">Function index</a></li> \n" \
+			"			   <li><a href=\"modules.html\">Modules</a></li> \n" \
+			"			   </ul> \n" \
+			"		 </li> \n" \
+			"		 <li><a href=\"#\">Examples</a> \n" \
+			"			 <ul id=\"topmenuexample\"> \n" \
+			"				 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+			"				 <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+			"			 </ul> \n" \
+			"		 </li> \n" \
+			" </ul> \n" \
+			  "    </div>\n" \
+			  "  </div>\n" \
+			  "  <div class=\"wrapper\">\n" \
+			  "    <div class=\"hd\">\n" \
+			  "      <span></span>\n" \
+			  "    </div>\n" \
+			  "    <div class=\"bd group\">\n" \
+			  "      <div class=\"sidebar\">\n" \
+			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+			  "          <h2 title=\"API Lookup\"><span></span>\n" \
+			  "            API Lookup</h2>\n" \
+			  "          <div  id=\"list001\" class=\"list\">\n" \
+			  "          <ul id=\"ul001\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"index.html#platform-compatibility\">Platform Compatibility</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qml-plugins.html\">QML Plugins</a></li>\n" \
+			  "            </ul> \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
+			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
+			  "            Qt Topics</h2>\n" \
+			  "          <div id=\"list002\" class=\"list\">\n" \
+			  "            <ul id=\"ul002\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/\">Qt 4.7</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/4.7-snapshot/platform-specific.html\">Platform-specific info</a></li>\n" \
+			  "            </ul>  \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"box\" id=\"examples\">\n" \
+			  "          <h2 title=\"Examples\"><span></span>\n" \
+			  "            Examples</h2>\n" \
+			  "          <div id=\"list003\" class=\"list\">\n" \
+			  "        <ul id=\"ul003\">\n" \
+			  "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+			  "            </ul> \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "      </div>\n" \
+			  "      <div class=\"wrap\">\n" \
+			  "        <div class=\"toolbar\">\n" \
+			  "          <div class=\"breadcrumb toolblock\">\n" \
+			  "            <ul>\n" \
+			  "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+			  "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader     = "            </ul>\n" \
+			  "          </div>\n" \
+			  "          <div class=\"toolbuttons toolblock\">\n" \
+			  "            <ul>\n" \
+			  "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+			  "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+			  "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+			  "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+			  "                <span>Print</span></a></li>\n" \
+			  "            </ul>\n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"content\">\n"
+
+HTML.footer             = "        <!-- /div -->\n" \
+			  "        <div class=\"feedback t_button\">\n" \
+			  "          [+] Documentation Feedback</div>\n" \
+			  "      </div>\n" \
+			  "    </div>\n" \
+			  "    <div class=\"ft\">\n" \
+			  "      <span></span>\n" \
+			  "    </div>\n" \
+			  "  </div> \n" \
+			  "  </div> \n" \
+			  "  <div class=\"footer\">\n" \
+			  "    <p>\n" \
+			  "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+			  "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+			  "      in Finland and/or other countries worldwide.</p>\n" \
+			  "    <p>\n" \
+			  "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+			  "  </div>\n" \
+			  "  <div id=\"feedbackBox\">\n" \
+			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+			  "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <div class=\"note\"><p>Make sure it is related to this specific page. For more general bugs and \n" \
+			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p></div>\n" \
+			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
+			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+			  "    </form>\n" \
+			  "  </div>\n" \
+			  "  <div id=\"blurpage\">\n" \
+			  "  </div>\n" \
+                          "  </div>\n"
diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf
index b0d9a1bc1d..0cc70e76fa 100644
--- a/doc/src/qtmobility.qdocconf
+++ b/doc/src/qtmobility.qdocconf
@@ -1,9 +1,4 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
 include(qt-html-templates.qdocconf)
-include(qt-defines.qdocconf)
-include(qtmobility-cpp-ignore.qdocconf)
 
 project                 = QtMobility
 description             = Qt Mobility Project Library Reference Documentation
@@ -162,6 +157,7 @@ excludedirs = ../../src/messaging/win32wce \
               ../../src/publishsubscribe/symbian
 
 exampledirs = ../../examples \
+              ../../tutorials \
               ../../demos \
               ../.. \
               .
diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp
index 0acc3d3ed4..945046867e 100644
--- a/examples/sysinfo/dialog.cpp
+++ b/examples/sysinfo/dialog.cpp
@@ -162,23 +162,23 @@ void Dialog::setupDevice()
 //! [inputMethod flags]
     QSystemDeviceInfo::InputMethodFlags methods = di->inputMethodType();
     QStringList inputs;
-    if((methods & QSystemDeviceInfo::Keys)=QSystemDeviceInfo::Keypad){
+    if ((methods & QSystemDeviceInfo::Keys)=QSystemDeviceInfo::Keypad){
         inputs << "Keys";
     }
-    if((methods & QSystemDeviceInfo::Keypad)=QSystemDeviceInfo::Keypad) {
+    if ((methods & QSystemDeviceInfo::Keypad)=QSystemDeviceInfo::Keypad) {
         inputs << "Keypad";
     }
 //! [inputMethod flags]
-    if((methods & QSystemDeviceInfo::Keyboard)=QSystemDeviceInfo::Keyboard) {
+    if ((methods & QSystemDeviceInfo::Keyboard)=QSystemDeviceInfo::Keyboard) {
         inputs << "Keyboard";
     }
-    if((methods & QSystemDeviceInfo::SingleTouch)=QSystemDeviceInfo::SingleTouch) {
+    if ((methods & QSystemDeviceInfo::SingleTouch)=QSystemDeviceInfo::SingleTouch) {
         inputs << "Touch Screen";
     }
-    if((methods & QSystemDeviceInfo::MultiTouch)=QSystemDeviceInfo::MultiTouch) {
+    if ((methods & QSystemDeviceInfo::MultiTouch)=QSystemDeviceInfo::MultiTouch) {
         inputs << "Multi touch";
     }
-    if((methods & QSystemDeviceInfo::Mouse)=QSystemDeviceInfo::Mouse){
+    if ((methods & QSystemDeviceInfo::Mouse)=QSystemDeviceInfo::Mouse){
         inputs << "Mouse";
     }
 
@@ -198,9 +198,9 @@ void Dialog::setupDevice()
 
     QString lockState;
     QSystemDeviceInfo::LockTypeFlags lock = di->lockStatus();
-    if((lock & QSystemDeviceInfo::PinLocked)){
+    if ((lock & QSystemDeviceInfo::PinLocked)){
         lockState = "Pin/Password Locked";
-    } else if((lock & QSystemDeviceInfo::TouchAndKeyboardLocked)){
+    } else if ((lock & QSystemDeviceInfo::TouchAndKeyboardLocked)){
         lockState = "Touch and keyboard locked";
     } else {
         lockState = "Unknown";
@@ -219,7 +219,7 @@ void Dialog::updateKeyboard(QSystemDeviceInfo::KeyboardTypeFlags type)
         halfKeysRadioButton->setChecked(true);
     } else if ((type & QSystemDeviceInfo::FullQwertyKeyboard)) {
         qwertyKeysRadioButton->setChecked(true);
-    } else if((type & QSystemDeviceInfo::WirelessKeyboard)) {
+    } else if ((type & QSystemDeviceInfo::WirelessKeyboard)) {
         wirelessRadioButton->setChecked(true);
     } else {
         uknownKeysRadioButton->setChecked(true);
@@ -242,7 +242,7 @@ void Dialog::updateProfile(QSystemDeviceInfo::Profile /*profile*/)
 
 void Dialog::setupDisplay()
 {
-    if(!dis) {
+    if (!dis) {
         dis = new QSystemDisplayInfo(this);
         connect(dis,SIGNAL(orientationChanged(QSystemDisplayInfo::DisplayOrientation)),
                 this,SLOT(orientationChanged(QSystemDisplayInfo::DisplayOrientation )));
@@ -264,7 +264,7 @@ void Dialog::setupDisplay()
 
 void Dialog::setupStorage()
 {
-    if(!sti) {
+    if (!sti) {
     sti = new QSystemStorageInfo(this);
     storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
 
@@ -286,22 +286,22 @@ void Dialog::updateStorage()
         QString type;
         QSystemStorageInfo::DriveType volType;
         volType = sti->typeForDrive(volName);
-        if(volType == QSystemStorageInfo::InternalDrive) {
+        if (volType == QSystemStorageInfo::InternalDrive) {
             type =  "Internal";
         }
-        if(volType == QSystemStorageInfo::RemovableDrive) {
+        if (volType == QSystemStorageInfo::RemovableDrive) {
             type = "Removable";
         }
-        if(volType == QSystemStorageInfo::CdromDrive) {
+        if (volType == QSystemStorageInfo::CdromDrive) {
             type =  "CDRom";
         }
-        if(volType == QSystemStorageInfo::RemoteDrive) {
+        if (volType == QSystemStorageInfo::RemoteDrive) {
             type =  "Network";
         }
-        if(volType == QSystemStorageInfo::InternalFlashDrive) {
+        if (volType == QSystemStorageInfo::InternalFlashDrive) {
             type =  "Flash";
         }
-        if(volType == QSystemStorageInfo::RamDrive) {
+        if (volType == QSystemStorageInfo::RamDrive) {
             type =  "Ram";
         }
         QStringList items;
@@ -366,7 +366,7 @@ void Dialog::netStatusComboActivated(int index)
     macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex));
 
     int strength = ni->networkSignalStrength((QSystemNetworkInfo::NetworkMode)reIndex);
-    if(strength < 0)
+    if (strength < 0)
         strength = 0;
     signalLevelProgressBar->setValue(strength);
 
@@ -374,7 +374,7 @@ void Dialog::netStatusComboActivated(int index)
 
     operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex));
 
-    if((index == 1 || index == 2 || index == 3)
+    if ((index == 1 || index == 2 || index == 3)
         && ni->networkStatus((QSystemNetworkInfo::NetworkMode)reIndex)
                              != QSystemNetworkInfo::UndefinedStatus) {
 
@@ -543,7 +543,7 @@ void Dialog::updatePowerState(QSystemDeviceInfo::PowerState /*newState*/)
 
 void Dialog::displayBatteryStatus(QSystemBatteryInfo::BatteryStatus status)
 {
-    if(currentBatStat == status)
+    if (currentBatStat == status)
         return;
     QString msg;
         switch(status) {
@@ -598,32 +598,74 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode ,
         strength = 0;
     }
 
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GprsMode) {
+        if (netStatusComboBox->currentText() == "Gprs") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::EdgeMode) {
+        if (netStatusComboBox->currentText() == "Edge") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::HspaMode) {
+        if (netStatusComboBox->currentText() == "Hpsa") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
             signalLevelProgressBar->setValue(strength);
         }
     }
@@ -632,95 +674,202 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode ,
 
 void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QString &text)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::GprsMode) {
+        if (netStatusComboBox->currentText() == "Gprs") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::EdgeMode) {
+        if (netStatusComboBox->currentText() == "Edge") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::HspaMode) {
+        if (netStatusComboBox->currentText() == "Hpsa") {
             operatorNameLabel->setText(text);
         }
     }
 
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
+            operatorNameLabel->setText(text);
+        }
+    }
 }
 
 void Dialog::networkStatusChanged(QSystemNetworkInfo::NetworkMode mode , QSystemNetworkInfo::NetworkStatus status)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
            displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
            displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
             displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
             displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::GprsMode) {
+        if (netStatusComboBox->currentText() == "Gprs") {
             displayNetworkStatus(status);
         }
     }
 
+    if (mode == QSystemNetworkInfo::EdgeMode) {
+        if (netStatusComboBox->currentText() == "Edge") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::HspaMode) {
+        if (netStatusComboBox->currentText() == "Hspa") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
+            displayNetworkStatus(status);
+        }
+    }
 }
 
 void Dialog::networkModeChanged(QSystemNetworkInfo::NetworkMode mode)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        primaryModeLabel->setText("None");
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        primaryModeLabel->setText("Gsm");
+    }
+
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        primaryModeLabel->setText("Cdma");
+    }
+
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        primaryModeLabel->setText("Wcdma");
+    }
+    if (mode == QSystemNetworkInfo::WlanMode) {
         primaryModeLabel->setText("Wlan");
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
+    if (mode == QSystemNetworkInfo::EthernetMode) {
         primaryModeLabel->setText("Ethernet");
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        primaryModeLabel->setText("Gsm");
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        primaryModeLabel->setText("Bluetooth");
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        primaryModeLabel->setText("Cdma");
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        primaryModeLabel->setText("Wimax");
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        primaryModeLabel->setText("Wcdma");
+    if (mode == QSystemNetworkInfo::GprsMode) {
+        primaryModeLabel->setText("Gprs");
     }
-    if(mode == QSystemNetworkInfo::UnknownMode) {
-        primaryModeLabel->setText("None");
+
+    if (mode == QSystemNetworkInfo::EdgeMode) {
+        primaryModeLabel->setText("Edge");
+    }
+
+    if (mode == QSystemNetworkInfo::HspaMode) {
+        primaryModeLabel->setText("Hspa");
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        primaryModeLabel->setText("Lte");
     }
 }
 
@@ -763,7 +912,7 @@ void Dialog::displayNetworkStatus(QSystemNetworkInfo::NetworkStatus status)
 void Dialog::updateProfile()
 {
 
-    if(di) {
+    if (di) {
         QString profilestring;
         switch(di->currentProfile()) {
             case QSystemDeviceInfo::SilentProfile:
@@ -823,7 +972,7 @@ void Dialog::updateProfile()
 
 void Dialog::updateSimStatus()
 {
-    if(di) {
+    if (di) {
         QString simstring;
         switch(di->simStatus()) {
         case QSystemDeviceInfo::SimLocked:
@@ -856,7 +1005,7 @@ void Dialog::updateSimStatus()
 
 void Dialog::storageChanged(bool added,const QString &volName)
 {
-    if(added) {
+    if (added) {
         updateStorage();
     } else {
         storageTreeWidget->takeTopLevelItem( storageTreeWidget->indexOfTopLevelItem(storageTreeWidget->findItems(volName,Qt::MatchExactly).at(0)));
@@ -932,7 +1081,7 @@ void Dialog::setupBattery()
 
 void Dialog::chargingStateChanged(QSystemBatteryInfo::ChargingState chargingState)
 {
-    if(chargingState == QSystemBatteryInfo::Charging) {
+    if (chargingState == QSystemBatteryInfo::Charging) {
         chargingCheckBox->setChecked(true);
     } else {
         chargingCheckBox->setChecked(false);
@@ -943,17 +1092,17 @@ void Dialog::chargingStateChanged(QSystemBatteryInfo::ChargingState chargingStat
 
 void Dialog::chargerTypeChanged(QSystemBatteryInfo::ChargerType chargerType)
 {
-    if(chargerType == QSystemBatteryInfo::NoCharger) {
+    if (chargerType == QSystemBatteryInfo::NoCharger) {
         radioButton_2->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::WallCharger) {
+    } else if (chargerType == QSystemBatteryInfo::WallCharger) {
         radioButton_3->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USBCharger) {
+    } else if (chargerType == QSystemBatteryInfo::USBCharger) {
         radioButton_4->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USB_500mACharger) {
+    } else if (chargerType == QSystemBatteryInfo::USB_500mACharger) {
         radioButton_5->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USB_100mACharger) {
+    } else if (chargerType == QSystemBatteryInfo::USB_100mACharger) {
         radioButton_6->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::VariableCurrentCharger) {
+    } else if (chargerType == QSystemBatteryInfo::VariableCurrentCharger) {
         radioButton_7->setChecked(true);
     } else {
         radioButton->setChecked(true);
diff --git a/examples/sysinfo/dialog_small_landscape.ui b/examples/sysinfo/dialog_small_landscape.ui
index 9a9f345405..1b8458eba6 100644
--- a/examples/sysinfo/dialog_small_landscape.ui
+++ b/examples/sysinfo/dialog_small_landscape.ui
@@ -1553,6 +1553,31 @@
            <string>Bluetooth</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>Wimax</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Gprs</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Edge</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Hspa</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Lte</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item row="1" column="0">
diff --git a/src/systeminfo/qsystemdisplayinfo.cpp b/src/systeminfo/qsystemdisplayinfo.cpp
index 9fbfb76ff0..cdfbeb0789 100644
--- a/src/systeminfo/qsystemdisplayinfo.cpp
+++ b/src/systeminfo/qsystemdisplayinfo.cpp
@@ -152,6 +152,7 @@ QSystemDisplayInfo::DisplayOrientation QSystemDisplayInfo::orientation(int scree
 
 /*!
     Returns the current contrast of the screen \a screen, from 0 to 1.
+    \bold sNOTE: Some platforms do not support detecting the contrast of the display.
 
     \sa QDesktopWidget::screenCount()
 */
diff --git a/src/systeminfo/qsysteminfo_mac.mm b/src/systeminfo/qsysteminfo_mac.mm
index c81c2c7add..b08623b5b7 100644
--- a/src/systeminfo/qsysteminfo_mac.mm
+++ b/src/systeminfo/qsysteminfo_mac.mm
@@ -1699,7 +1699,7 @@ void unmountCallback(DADiskRef disk, void *context)
 }
 
 QSystemStorageInfoPrivate::QSystemStorageInfoPrivate(QObject *parent)
-        : QObject(parent), daSessionThread(0),sessionThreadStarted(0), storageTimer(0)
+        : QObject(parent), storageTimer(0), daSessionThread(0),sessionThreadStarted(0)
 {
     updateVolumesMap();
     checkAvailableStorage();