Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

6 files changed, 91 insertions, 10 deletions

diff --git a/dist/changes-5.3.0 b/dist/changes-5.3.0
new file mode 100644
index 00000000..1bf445a7
--- /dev/null
+++ b/dist/changes-5.3.0
@@ -0,0 +1,74 @@
+Qt 5.3 introduces many new features and improvements as well as bugfixes
+over the 5.2.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.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+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
+--------------------
+
+ - New SatelliteInfo example added. The example displays the signal
+   strength of surrounding satellites. The example employs a demo mode on
+   those platforms which don't provide satellite information
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtPositioning
+-------------
+
+ - Position (QML):
+   * Added direction and vertical speed properties.
+
+ - QGeoPositionInfoSource:
+   * iOS position backend added.
+   * [QTBUG-34102] Android backend added. Android devices can retrieve
+     their current position. Network- and Satellite-based providers are
+     supported.
+
+ - QGeoSatelliteInfoSource:
+   * [QTBUG-34102] Android backend added. Android devices can retrieve
+     information about the currently accessible GPS and GLONASS satellites.
+
+ - QGeoRectangle:
+   * Added QGeoRectangle(QList<QGeoCoordinate>) constructor added.
+   * Improved class documentation.
+
+ - QGeoShape:
+   * Added extendShape(QGeoCoordinate) function.
+
+ - QNmeaPositionInfoSource:
+   * Added support for reporting position accuracy.
+
+
+****************************************************************************
+*                       Plugin Specific Changes                            *
+****************************************************************************
+
+GeoClue
+-------
+ - [QTBUG-36298] Reports direction of travel and
+   vertical speed attributes, if supported by the active Geoclue
+   provider.
+ - Fixed the emission of the updateTimeout() signal when
+   position updates do not arrive in a timely manner.
+ - Position info source provider no longer internally filters
+   position updates to the requested update interval.
+
diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf
index 10e7b19f..e2c0cc4b 100644
--- a/src/positioning/doc/qtpositioning.qdocconf
+++ b/src/positioning/doc/qtpositioning.qdocconf
@@ -55,3 +55,5 @@ imagedirs   += images
 navigation.landingpage = "Qt Positioning"
 navigation.cppclassespage = "Qt Positioning C++ Classes"
 navigation.qmltypespage = "Qt Positioning QML Types"
+
+manifestmeta.thumbnail.names += "QtPositioning/Log File*"
diff --git a/src/positioning/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc
index af8f4680..a1d0bb58 100644
--- a/src/positioning/doc/src/examples/declarative-flickr.qdoc
+++ b/src/positioning/doc/src/examples/declarative-flickr.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -34,7 +34,7 @@
            fetch local content from a web service.
 
     This is a small example, illustrating one of the very core parts of the
-    Qt Positioning API: the ability to retrieve and use the user's current
+    \l{Qt Positioning} API: the ability to retrieve and use the user's current
     geographic position.
 
     Key QML types shown in this example:
@@ -45,7 +45,9 @@
 
     \image  qml-flickr-1.jpg
 
-    \section2 Retrieving the Current Position
+    \include examples-run.qdocinc
+
+    \section1 Retrieving the Current Position
 
     Retrieving the user's current position is achieved using the PositionSource
     type. In this example, we instantiate the PositionSource as part of the
@@ -67,7 +69,7 @@
 
     \snippet flickr/flickrmobile/GeoTab.qml props
 
-    \section2 Using the Current Position
+    \section1 Using the Current Position
 
     The longitude and latitude values retrieved here are eventually set on
     in properties on the RestModel component. The RestModel is an XmlListModel,
diff --git a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc
index ac1d79ec..331c5536 100644
--- a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc
+++ b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -32,7 +32,6 @@
     \ingroup all-examples
     \ingroup qtpositioning
 
-    These are the Qt Positioning examples.
+    These are the \l{Qt Positioning} examples.
 
 */
-
diff --git a/src/positioning/doc/src/examples/satelliteinfo.qdoc b/src/positioning/doc/src/examples/satelliteinfo.qdoc
index 1edb8f6c..6a3ee8cb 100644
--- a/src/positioning/doc/src/examples/satelliteinfo.qdoc
+++ b/src/positioning/doc/src/examples/satelliteinfo.qdoc
@@ -35,7 +35,7 @@
 
     \ingroup qtpositioning-examples
 
-    Key Qt Positioning classes used in this example:
+    Key \l{Qt Positioning} classes used in this example:
 
     \list
     \li \l{QGeoSatelliteInfo}
@@ -70,4 +70,6 @@
     If the platform does not provide satellite information the application automatically
     switches into a demo mode whereby it continuously switches between predefined
     sets of satellite data.
+
+    \include examples-run.qdocinc
 */
diff --git a/src/positioning/doc/src/examples/weatherinfo.qdoc b/src/positioning/doc/src/examples/weatherinfo.qdoc
index 0c98cc04..a836d028 100644
--- a/src/positioning/doc/src/examples/weatherinfo.qdoc
+++ b/src/positioning/doc/src/examples/weatherinfo.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -34,7 +34,7 @@
 
     \ingroup qtpositioning-examples
 
-    Key Qt Positioning classes used in this example:
+    Key \l{Qt Positioning} classes used in this example:
 
     \list
     \li \l{QGeoPositionInfo}
@@ -43,6 +43,8 @@
 
     \image ../images/example-weatherinfo.png
 
+    \include examples-run.qdocinc
+
     The key part of this example is the application's data model, contained
     in the WeatherData and AppModel classes. WeatherData represents the weather
     information taken from the HTTP service. It is a simple data class, but we