Merge remote-tracking branch 'origin/5.15.0' into 5.15

Change-Id: Ied8bd656df6a6ad2c3d913905b32f8e08fd9d7e0

3 files changed, 52 insertions, 1 deletions

diff --git a/dist/changes-5.15.0 b/dist/changes-5.15.0
new file mode 100644
index 00000000..f084e9e2
--- /dev/null
+++ b/dist/changes-5.15.0
@@ -0,0 +1,51 @@
+Qt 5.15 introduces many new features and improvements as well as bugfixes
+over the 5.14.x series. 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.15 series is binary compatible with the 5.14.x series.
+Applications compiled for 5.14 will continue to run with 5.15.
+
+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                               *
+****************************************************************************
+
+ - QGeoPolygon:
+   * Fixed contains method.
+
+ - serialnmea plugin:
+   * [QTBUG-82819] Fixed serialnmea plugin initialization when used with serial port.
+
+ - [QTBUG-81069] Fixed a dangling pointer issue in QML PositionSource API.
+
+ - Fixed QGeoCoordinate::CoordinateFormat missing Q_ENUM.
+
+ - Removed the usage of deprecated APIs from other Qt modules.
+
+
+****************************************************************************
+*                              QtLocation                                  *
+****************************************************************************
+
+ - Added optional Argument to Map.fitViewportToMapItems.
+
+ - Fixed a memory leak related to MapObjects.border.
+
+ - Updated the 3rdparty library earcut.
+
+ - Fixed Map*ObjectsQSG implementation triggering QSGBatchRenderer crashes.
+
+ - Ported Map*ObjectPrivateQSG to the shader-based projection geometries.
+
+ - Fixed segmentation fault due to null pointer usage in qdeclarativepolylinemapitem.cpp.
+
+ - Removed the usage of deprecated APIs from other Qt modules.
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native
-Subproject d9577fdebe019b19e184b4cac82749ae9ec87af
+Subproject d7e368c42f2ac7971e81f60b981e566352f1e4f
diff --git a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
index dfe3d8e9..2f7839de 100644
--- a/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
+++ b/src/plugins/geoservices/osm/qgeotileproviderosm.cpp
@@ -339,7 +339,7 @@ void TileProvider::resolveProvider()
     request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork);
     QNetworkReply *reply = m_nm->get(request);
     connect(reply, SIGNAL(finished()), this, SLOT(onNetworkReplyFinished()) );
-    connect(reply, SIGNAL(errorOccured(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError)));
+    connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), this, SLOT(onNetworkReplyError(QNetworkReply::NetworkError)));
 }
 
 void TileProvider::handleError(QNetworkReply::NetworkError error)