Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2

6 files changed, 84 insertions, 11 deletions

diff --git a/dist/changes-5.8.0 b/dist/changes-5.8.0
new file mode 100644
index 00000000..1c2a5b45
--- /dev/null
+++ b/dist/changes-5.8.0
@@ -0,0 +1,70 @@
+Qt 5.8 introduces many new features and improvements as well as bugfixes
+over the 5.7.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.8 series is binary compatible with the 5.7.x series.
+Applications compiled for 5.7 will continue to run with 5.8.
+
+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.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+QtLocation
+-----------
+
+ - Added geoservices plugin to support ESRI mapping, geocoding and routing
+   services.
+ - Improved HERE geoservice plugin code base (improved warning) and converted
+   the HERE endpoints to newer versions (away from Nokia endpoints. At the same time
+   China specific URLs were removed.
+ - Improved Mapbox plugin to cater for better cache customization and
+   to support the standard box map modes.
+ - Renamed various internal C++ functions to improve code readability
+ - Added better high DPI support in the various geoservice provider plugins.
+   For more details see QTBUG-53318, QTBUG-48868 and QTBUG-36949.
+ - [QTBUG-45284] Added offline data support and improved cache handling in OSM
+   geoservice plugin
+ - Added routing support to Mapbox plugin
+ - Added server side provider support for QtLocation. This enables the quicker
+   selection of alternative providers by already deployed OSM applications in case
+   an OSM based default provider changes T&Cs.
+ - Removed QtSystemInfo dependency from QtLocation
+ - [QTBUG-56213] Adapted map related mouse/touch behavior following
+   changes to general mouse/touch handling in Qt QML
+ - Adapted QtLocation and QtPositioning to the Qt Lite related build system changes
+ - Marked QGeoMapPrivate as private export
+ - Added support for unitary tile caching. This enables use cases whereby the cache
+   size can be defined in number of tiles rather then bytes.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-55988] Added capability to ask for Location permissions at runtime. This is
+   required since Android 7.0.
+
+WinRT
+-----
+
+ - Fixed a name space related compile problem in the positioning plugin for WinRT
+ - Migrated the QtLocation rendering code to the new scenegraph changes enabling
+   Direct3D 12
+ - [QTBUG-54474] Added GeolocationAccessStatus existence check
+ - [QTBUG-56340] Added direction information to position updates
+ - [QTBUG-56623] Changed positioning plugin to use the platforms positioning time
+   stamp rather than a programmatically acquired time stamp at the time of the callback.
+   Effectively, this forwards time stamps from the GPS satellite to the user application.
+ - [QTBUG-53925] Enabled WinRT positioning backend for MSVC2013/2015
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 4536b371..a0b61d6e 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -166,8 +166,8 @@ public:
             qmlRegisterUncreatableType<QQuickGeoMapGestureArea, 1>(uri, major, minor, "MapGestureArea",
                                         QStringLiteral("(Map)GestureArea is not intended instantiable by developer."));
 
-            // Register the 5.7 types
-            minor = 7;
+            // Register the 5.8 types
+            minor = 8;
             qmlRegisterType<QDeclarativeGeoManeuver>(uri, major, minor, "RouteManeuver");
 
             // Register the 5.9 types
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 4e8749da..b89963ad 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtLocation 5.7'
+// 'qmlplugindump -nonrelocatable QtLocation 5.8'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QDeclarativeCategory"
         prototype: "QObject"
@@ -95,7 +95,7 @@ Module {
         prototype: "QObject"
         exports: [
             "QtLocation/RouteManeuver 5.0",
-            "QtLocation/RouteManeuver 5.7"
+            "QtLocation/RouteManeuver 5.8"
         ]
         exportMetaObjectRevisions: [0, 0]
         Enum {
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index 55fcbba2..ace5bfae 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtPositioning 5.7'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.8'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "LocationSingleton"
         prototype: "QObject"
@@ -106,7 +106,7 @@ Module {
             "QtPositioning/Position 5.0",
             "QtPositioning/Position 5.3",
             "QtPositioning/Position 5.4",
-            "QtPositioning/Position 5.7"
+            "QtPositioning/Position 5.8"
         ]
         exportMetaObjectRevisions: [0, 1, 2, 2]
         Property { name: "latitudeValid"; type: "bool"; isReadonly: true }
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 31627c39..f00a4ae6 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -551,12 +551,12 @@ public:
             qmlRegisterType<QQuickGeoCoordinateAnimation  >(uri, major, minor, "CoordinateAnimation");
             qmlRegisterType<QDeclarativePosition, 1             >(uri, major, minor, "Position");
 
-            // Register the 5.4 types
-            // Introduction of 5.4 version; existing 5.3 exports become automatically available under 5.4
             minor = 4;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
 
-            minor = 7;
+            // Register the 5.8 types
+            // Introduction of 5.8 version; existing 5.4 exports become automatically available under 5.8
+            minor = 8;
             qmlRegisterType<QDeclarativePosition, 2>(uri, major, minor, "Position");
         } else {
             qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri);
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
index 31d5ebc8..a36f15b3 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
@@ -318,6 +318,9 @@ QGeoTileSpec QGeoFileTileCacheOsm::filenameToTileSpec(const QString &filename) c
         numbers.append(value);
     }
 
+    if (numbers.at(0) > m_providers.size())
+        return emptySpec;
+
     bool highDpi = m_providers[numbers.at(0) - 1]->isHighDpi();
     if (highDpi && fields.at(1) != QLatin1Char('h'))
         return emptySpec;