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

Change-Id: I219444e81a9b304b11b0cecce84415acdb3ade57

16 files changed, 95 insertions, 55 deletions

diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 21972a5b..f2030659 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -45,7 +45,7 @@
 #include <QtPositioningQuick/private/qdeclarativepositionsource_p.h>
 #include <QtPositioningQuick/private/qdeclarativeposition_p.h>
 
-#include "qquickgeocoordinateanimation_p.h"
+#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h>
 #include "locationsingleton.h"
 
 #include <QtCore/QVariantAnimation>
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri
index 99d72a88..54a0824b 100644
--- a/src/location/declarativemaps/declarativemaps.pri
+++ b/src/location/declarativemaps/declarativemaps.pri
@@ -1,4 +1,4 @@
-QT += quick-private network positioning-private qml-private core-private gui-private
+QT += quick-private network positioning-private positioningquick-private qml-private core-private gui-private
 
 INCLUDEPATH += declarativemaps
 
@@ -29,8 +29,7 @@ PRIVATE_HEADERS += \
         declarativemaps/qgeomapobject_p.h \
         declarativemaps/qgeomapobject_p_p.h \
         declarativemaps/qparameterizableobject_p.h \
-        declarativemaps/qquickgeomapgesturearea_p.h \
-        ../imports/positioning/qquickgeocoordinateanimation_p.h
+        declarativemaps/qquickgeomapgesturearea_p.h
 
 SOURCES += \
         declarativemaps/error_messages.cpp \
@@ -58,8 +57,7 @@ SOURCES += \
         declarativemaps/qgeomapitemgeometry.cpp \
         declarativemaps/qgeomapobject.cpp \
         declarativemaps/qparameterizableobject.cpp \
-        declarativemaps/qquickgeomapgesturearea.cpp \
-        ../imports/positioning/qquickgeocoordinateanimation.cpp
+        declarativemaps/qquickgeomapgesturearea.cpp
 
 load(qt_build_paths)
 LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix()
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
index c6f4b42f..b15dbc4d 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp
+++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qquickgeomapgesturearea_p.h"
-#include "qquickgeocoordinateanimation_p.h"
+#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h>
 #include "qdeclarativegeomap_p.h"
 #include "error_messages_p.h"
 
diff --git a/src/location/doc/src/plugins/esri.qdoc b/src/location/doc/src/plugins/esri.qdoc
index 2707ca5d..dc28c906 100644
--- a/src/location/doc/src/plugins/esri.qdoc
+++ b/src/location/doc/src/plugins/esri.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013-2016 Esri <contracts@esri.com>
+** Copyright (C) 2013-2018 Esri <contracts@esri.com>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -42,18 +42,14 @@ Data is provided by \l {http://www.esri.com/data/find-data}{many different conte
 
 The Esri geoservices plugin can be loaded by using the plugin key "esri".
 
-To use the services provided by the Esri platform, a subscription is required. There are two kinds of subscriptions:
-
-\list
-    \li \l {https://developers.arcgis.com/plans/}{Developer Subscription}
-    \li \l {http://www.arcgis.com/features/plans/pricing.html}{ArcGIS Online Subscription}
-\endlist
+You can use the services provided by Esri's ArcGIS Platform by subscribing to the ArcGIS Developer Program, at no charge. See the "Essentials" plan details here: {https://developers.arcgis.com/pricing/}{ArcGIS Developer Program Pricing}.
 
 The Developer subscription offers a free-of-charge option for developing and testing your applications.
 With this, your applications can go to production under the following conditions:
 
 \list
-    \li The app can request up to one million maps per month, and one million geocodes per month.
+    \li The app can request up to one million maps per month.
+    \li 50 credits are included with the Developer subscription. The costs are 40 credits for 1000 geocodes, and 0.5 credits per route generated. Place searches are free.
     \li The app does not directly generate revenue. That is, end users must be able to obtain it and to use it for free.
 \endlist
 
@@ -70,7 +66,7 @@ gives applications full access to the ArcGIS platform.
     \li Description
 \row
     \li esri.token
-    \li Security token for using routing services only. Mapping and geocoding services do not require a token.
+    \li Security token for using routing services only. Mapping, geocoding and place searches services do not require a token.
 \endtable
 
 To use the routing services hosted on ArcGIS Online with the Esri plugin, a token is required.
diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc
index 51b49f93..b1d721bf 100644
--- a/src/location/doc/src/plugins/mapboxgl.qdoc
+++ b/src/location/doc/src/plugins/mapboxgl.qdoc
@@ -88,6 +88,11 @@ The following table lists optional parameters that can be passed to the Mapbox p
     \l{https://www.mapbox.com/tos}{Terms of Services} and must not be used in production. This property has
     no effect on styles hosted outside the Mapbox servers.
 \row
+    \li mapboxgl.china
+    \li Use Mapbox China API base URLs and styles.
+    Please notice that Mapbox China requires a specific access token. Contact \l
+    {https://www.mapbox.com/contact/sales/} {Mapbox sales} for more information.
+\row
     \li mapboxgl.mapping.additional_style_urls
     \li Additional, comma separated, Mapbox \l{https://www.mapbox.com/help/define-style-url}
     {style URLs} to be added to the available style URLs. Additional styles will be prepended to
diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc
index 1f27a14a..77c2cd99 100644
--- a/src/location/doc/src/qtlocation.qdoc
+++ b/src/location/doc/src/qtlocation.qdoc
@@ -45,12 +45,16 @@
     Include the appropriate header in your C++ code. For example,
     applications using routes can include:
 
-    \code #include <QGeoRoute> \endcode
+    \code
+    #include <QGeoRoute>
+    \endcode
 
     Add the \e location keyword in the project file to link against the
     Qt Location library:
 
-    \code QT += location \endcode
+    \badcode
+    QT += location
+    \endcode
 
     See more in the \l{Qt Location}{Qt Location Overview}.
 
@@ -95,11 +99,15 @@ import the QtPositioning module as well.
 For C++ projects include the header appropriate for the current use case,
 for example applications using routes may use
 
-\code #include <QGeoRoute> \endcode
+\code
+#include <QGeoRoute>
+\endcode
 
 The .pro file should have the \e location keyword added
 
-\code QT += location \endcode
+\code
+QT += location
+\endcode
 
 \section2 Submodules
 
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index 4614de89..ed36cd5f 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -378,7 +378,7 @@ QString QGeoMapMapboxGL::copyrightsStyleSheet() const
     return QStringLiteral("* { vertical-align: middle; font-weight: normal }");
 }
 
-void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings)
+void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings, bool useChinaEndpoint)
 {
     Q_D(QGeoMapMapboxGL);
 
@@ -386,8 +386,13 @@ void QGeoMapMapboxGL::setMapboxGLSettings(const QMapboxGLSettings& settings)
 
     // If the access token is not set, use the development access token.
     // This will only affect mapbox:// styles.
+    // Mapbox China requires a China-specific access token.
     if (d->m_settings.accessToken().isEmpty()) {
-        d->m_settings.setAccessToken(developmentToken);
+        if (useChinaEndpoint) {
+            qWarning("Mapbox China requires an access token: https://www.mapbox.com/contact/sales");
+        } else {
+            d->m_settings.setAccessToken(developmentToken);
+        }
     }
 }
 
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
index 0ffaf4ea..5fc2260e 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
@@ -54,7 +54,7 @@ public:
     virtual ~QGeoMapMapboxGL();
 
     QString copyrightsStyleSheet() const override;
-    void setMapboxGLSettings(const QMapboxGLSettings &);
+    void setMapboxGLSettings(const QMapboxGLSettings &, bool useChinaEndpoint);
     void setUseFBO(bool);
     void setMapItemsBefore(const QString &);
     Capabilities capabilities() const override;
diff --git a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
index cc48afb2..d2463106 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.cpp
@@ -69,30 +69,45 @@ QGeoMappingManagerEngineMapboxGL::QGeoMappingManagerEngineMapboxGL(const QVarian
     int mapId = 0;
     const QByteArray pluginName = "mapboxgl";
 
-    mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/streets-v10"),
-            tr("Streets"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/basic-v9"),
-            tr("Basic"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/bright-v9"),
-            tr("Bright"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::TerrainMap, QStringLiteral("mapbox://styles/mapbox/outdoors-v10"),
-            tr("Outdoors"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, QStringLiteral("mapbox://styles/mapbox/satellite-v9"),
-            tr("Satellite"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::HybridMap, QStringLiteral("mapbox://styles/mapbox/satellite-streets-v10"),
-            tr("Satellite Streets"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/light-v9"),
-            tr("Light"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/dark-v9"),
-            tr("Dark"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::TransitMap, QStringLiteral("mapbox://styles/mapbox/navigation-preview-day-v2"),
-            tr("Navigation Preview Day"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::TransitMap, QStringLiteral("mapbox://styles/mapbox/navigation-preview-night-v2"),
-            tr("Navigation Preview Night"), false, true, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::CarNavigationMap, QStringLiteral("mapbox://styles/mapbox/navigation-guidance-day-v2"),
-            tr("Navigation Guidance Day"), false, false, ++mapId, pluginName, cameraCaps);
-    mapTypes << QGeoMapType(QGeoMapType::CarNavigationMap, QStringLiteral("mapbox://styles/mapbox/navigation-guidance-night-v2"),
-            tr("Navigation Guidance Night"), false, true, ++mapId, pluginName, cameraCaps);
+    if (parameters.contains(QStringLiteral("mapboxgl.china"))) {
+        m_useChinaEndpoint = parameters.value(QStringLiteral("mapboxgl.china")).toBool();
+    }
+
+    if (m_useChinaEndpoint) {
+        m_settings.setApiBaseUrl(QStringLiteral("https://api.mapbox.cn"));
+
+        mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/streets-zh-v1"),
+                tr("China Streets"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/light-zh-v1"),
+                tr("China Light"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/dark-zh-v1"),
+                tr("China Dark"), false, false, ++mapId, pluginName, cameraCaps);
+    } else {
+        mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/streets-v10"),
+                tr("Streets"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/basic-v9"),
+                tr("Basic"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("mapbox://styles/mapbox/bright-v9"),
+                tr("Bright"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::TerrainMap, QStringLiteral("mapbox://styles/mapbox/outdoors-v10"),
+                tr("Outdoors"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay, QStringLiteral("mapbox://styles/mapbox/satellite-v9"),
+                tr("Satellite"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::HybridMap, QStringLiteral("mapbox://styles/mapbox/satellite-streets-v10"),
+                tr("Satellite Streets"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/light-v9"),
+                tr("Light"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::GrayStreetMap, QStringLiteral("mapbox://styles/mapbox/dark-v9"),
+                tr("Dark"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::TransitMap, QStringLiteral("mapbox://styles/mapbox/navigation-preview-day-v2"),
+                tr("Navigation Preview Day"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::TransitMap, QStringLiteral("mapbox://styles/mapbox/navigation-preview-night-v2"),
+                tr("Navigation Preview Night"), false, true, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::CarNavigationMap, QStringLiteral("mapbox://styles/mapbox/navigation-guidance-day-v2"),
+                tr("Navigation Guidance Day"), false, false, ++mapId, pluginName, cameraCaps);
+        mapTypes << QGeoMapType(QGeoMapType::CarNavigationMap, QStringLiteral("mapbox://styles/mapbox/navigation-guidance-night-v2"),
+                tr("Navigation Guidance Night"), false, true, ++mapId, pluginName, cameraCaps);
+    }
 
     if (parameters.contains(QStringLiteral("mapboxgl.mapping.additional_style_urls"))) {
         const QString ids = parameters.value(QStringLiteral("mapboxgl.mapping.additional_style_urls")).toString();
@@ -156,7 +171,7 @@ QGeoMappingManagerEngineMapboxGL::~QGeoMappingManagerEngineMapboxGL()
 QGeoMap *QGeoMappingManagerEngineMapboxGL::createMap()
 {
     QGeoMapMapboxGL* map = new QGeoMapMapboxGL(this, 0);
-    map->setMapboxGLSettings(m_settings);
+    map->setMapboxGLSettings(m_settings, m_useChinaEndpoint);
     map->setUseFBO(m_useFBO);
     map->setMapItemsBefore(m_mapItemsBefore);
 
diff --git a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
index b3afe77b..9ceb8ccc 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
@@ -59,6 +59,7 @@ public:
 private:
     QMapboxGLSettings m_settings;
     bool m_useFBO = true;
+    bool m_useChinaEndpoint = false;
     QString m_mapItemsBefore;
 };
 
diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index f0094ff0..7c30ef07 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -40,12 +40,15 @@
     For C++ projects include the header appropriate for the current use case,
     for example applications using routes may use
 
-    \code #include <QGeoCoordinate> \endcode
+    \code
+    #include <QGeoCoordinate>
+    \endcode
 
     The .pro file should have the \e positioning keyword added
 
-    \code QT += positioning \endcode
-
+    \badcode
+    QT += positioning
+    \endcode
 
     See more in the \l{Qt Positioning}{Qt Positioning Overview}.
 
@@ -87,11 +90,15 @@ To load the Qt Positioning module, add the following statement to your .qml file
 For C++ projects include the header appropriate for the current use case,
 for example applications using routes may use
 
-\code #include <QGeoCoordinate> \endcode
+\code
+#include <QGeoCoordinate>
+\endcode
 
 The .pro file should have the \e positioning keyword added
 
-\code QT += positioning \endcode
+\badcode
+QT += positioning
+\endcode
 
 \section1 Licenses
 
diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp
index 35d82b5f..beb43692 100644
--- a/src/positioning/qgeopath.cpp
+++ b/src/positioning/qgeopath.cpp
@@ -483,6 +483,9 @@ void QGeoPathPrivate::setWidth(const qreal &width)
 
 double QGeoPathPrivate::length(int indexFrom, int indexTo) const
 {
+    if (path().isEmpty())
+        return 0.0;
+
     bool wrap = indexTo == -1;
     if (indexTo < 0 || indexTo >= path().size())
         indexTo = path().size() - 1;
diff --git a/src/imports/positioning/qquickgeocoordinateanimation.cpp b/src/positioningquick/qquickgeocoordinateanimation.cpp
index b00f187d..b00f187d 100644
--- a/src/imports/positioning/qquickgeocoordinateanimation.cpp
+++ b/src/positioningquick/qquickgeocoordinateanimation.cpp
diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p.h b/src/positioningquick/qquickgeocoordinateanimation_p.h
index 95f8dc07..c616d780 100644
--- a/src/imports/positioning/qquickgeocoordinateanimation_p.h
+++ b/src/positioningquick/qquickgeocoordinateanimation_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtPositioningQuick/private/qpositioningquickglobal_p.h>
 #include <QtQuick/private/qquickanimation_p.h>
 #include <QtPositioning/qgeocoordinate.h>
 
@@ -58,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickGeoCoordinateAnimationPrivate;
 
-class QQuickGeoCoordinateAnimation : public QQuickPropertyAnimation
+class Q_POSITIONINGQUICK_PRIVATE_EXPORT QQuickGeoCoordinateAnimation : public QQuickPropertyAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickGeoCoordinateAnimation)
@@ -90,7 +91,7 @@ Q_SIGNALS:
     void directionChanged();
 };
 
-QVariant q_coordinateInterpolator(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress);
+QVariant Q_POSITIONINGQUICK_PRIVATE_EXPORT q_coordinateInterpolator(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress);
 
 QT_END_NAMESPACE
 
diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p_p.h b/src/positioningquick/qquickgeocoordinateanimation_p_p.h
index 946a38cb..946a38cb 100644
--- a/src/imports/positioning/qquickgeocoordinateanimation_p_p.h
+++ b/src/positioningquick/qquickgeocoordinateanimation_p_p.h
diff --git a/tests/auto/qgeopath/tst_qgeopath.cpp b/tests/auto/qgeopath/tst_qgeopath.cpp
index 97bf69fe..213af0ad 100644
--- a/tests/auto/qgeopath/tst_qgeopath.cpp
+++ b/tests/auto/qgeopath/tst_qgeopath.cpp
@@ -70,6 +70,7 @@ void tst_QGeoPath::defaultConstructor()
     QGeoPath p;
     QVERIFY(!p.path().size());
     QCOMPARE(p.width(), qreal(0.0));
+    QCOMPARE(p.length(), double(0.0));
 }
 
 void tst_QGeoPath::listConstructor()