Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I84535e988c19639c86f8f4837cc8fdb882f3c505

2 files changed, 73 insertions, 2 deletions

diff --git a/dist/changes-5.2.0 b/dist/changes-5.2.0
new file mode 100644
index 00000000..c371ae11
--- /dev/null
+++ b/dist/changes-5.2.0
@@ -0,0 +1,71 @@
+Qt 5.2 introduces many new features and improvements as well as bugfixes
+over the 5.1.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.2
+
+The Qt version 5.2 series is binary compatible with the 5.1.x series.
+Applications compiled for 5.1 will continue to run with 5.2.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtSensors
+------
+
+- QAmbientTemperaturSensor, QPressureSensor and QProximitySensor have been
+  implemented on Android.
+
+- Various documentation and example improvements have been made.
+
+- QTBUG-34050: The sensorfw plugin can handle the restart of sensord
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+- QTBUG-34050: The sensorfw plugin can handle the restart of sensord.
+
+- The sensor plugin for Blackberry has received a variety of bug fixes.
diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc
index a90694c0..7e4bf15f 100644
--- a/src/sensors/doc/src/qtsensors5.qdoc
+++ b/src/sensors/doc/src/qtsensors5.qdoc
@@ -52,10 +52,10 @@
     If the module is imported into a namespace, some additional methods become available.
 
     \code
-    import QtSensors 5.0 as Sensors
+    import QtSensors 5.0
     ...
         Component.onCompleted: {
-            var types = Sensors.sensorTypes();
+            var types = QmlSensors.sensorTypes();
             console.log(types.join(", "));
         }
     \endcode