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

Change-Id: I46962833cb56c4004df9410fe59dbd34fee5c2b0

4 files changed, 39 insertions, 6 deletions

diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3
new file mode 100644
index 00000000..f66e4695
--- /dev/null
+++ b/dist/changes-5.12.3
@@ -0,0 +1,33 @@
+Qt 5.12.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.2.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              QtPositioning                               *
+****************************************************************************
+
+ - Documented QGeoPath::length behavior properly.
+
+****************************************************************************
+*                               UNSPECIFIED                                *
+****************************************************************************
+
+ -  Fixed incorrect indexing of Mapbox tiles in the cache.
+ -  Fixed crash when destroying Maps containing MapItemViews.
+ -  Added a notice to the MapViewer example to inform when a HTTPS-based map
+    is selected without SSL support.
diff --git a/examples/positioning/geoflickr/geoflickr.pro b/examples/positioning/geoflickr/geoflickr.pro
index 4bbb7959..0bbfecd8 100644
--- a/examples/positioning/geoflickr/geoflickr.pro
+++ b/examples/positioning/geoflickr/geoflickr.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = geoflickr
 
-QT += qml quick network positioning
+QT += qml quick network positioning xmlpatterns
 SOURCES += qmllocationflickr.cpp
 
 RESOURCES += \
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
index 3208829c..f7a251a2 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
@@ -140,17 +140,17 @@ void QDeclarativeGeoMapItemView::classBegin()
 //    connect(m_delegateModel, &QQmlInstanceModel::initItem, this, &QDeclarativeGeoMapItemView::initItem);
 }
 
-void QDeclarativeGeoMapItemView::destroyingItem(QObject */*object*/)
+void QDeclarativeGeoMapItemView::destroyingItem(QObject * /*object*/)
 {
 
 }
 
-void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject */*object*/)
+void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject * /*object*/)
 {
 
 }
 
-void QDeclarativeGeoMapItemView::createdItem(int index, QObject */*object*/)
+void QDeclarativeGeoMapItemView::createdItem(int index, QObject * /*object*/)
 {
     if (!m_map)
         return;
diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc
index b1d721bf..c5e02810 100644
--- a/src/location/doc/src/plugins/mapboxgl.qdoc
+++ b/src/location/doc/src/plugins/mapboxgl.qdoc
@@ -180,8 +180,8 @@ replacing the dash with camel case for technical reasons (i.e. \b line-cap will
     \li source
     \li A style data \l {https://www.mapbox.com/mapbox-gl-js/style-spec/#sources}{source}. When using a source
     of \b sourceType \l {https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-geojson}{geojson}, the
-    \b data property can be both inlined or sourced from qrc.
-    \li Supported source types are: \b vector, \b raster, \b raster-dem and \b geojson.
+    \b data property can be both inlined or sourced from qrc. Supported source types are: \b vector, \b raster,
+    \b raster-dem and \b geojson.
 'geojson'.
 \row
     \li layer