3 files changed, 42 insertions, 2 deletions
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp
index 1b526435..1d44a31b 100644
--- a/examples/location/mapviewer/main.cpp
+++ b/examples/location/mapviewer/main.cpp
@@ -84,11 +84,33 @@ static bool parseArgs(QStringList& args, QVariantMap& parameters)
 
 int main(int argc, char *argv[])
 {
+    const QByteArray additionalLibraryPaths = qgetenv("QTLOCATION_EXTRA_LIBRARY_PATH");
+    for (const QByteArray &p : additionalLibraryPaths.split(':'))
+        QCoreApplication::addLibraryPath(QString(p));
+
     QGuiApplication application(argc, argv);
 
     QVariantMap parameters;
     QStringList args(QCoreApplication::arguments());
 
+    // Fetch tokens from the environment, if present
+    const QByteArray mapboxMapID = qgetenv("MAPBOX_MAP_ID");
+    const QByteArray mapboxAccessToken = qgetenv("MAPBOX_ACCESS_TOKEN");
+    const QByteArray hereAppID = qgetenv("HERE_APP_ID");
+    const QByteArray hereToken = qgetenv("HERE_TOKEN");
+    const QByteArray esriToken = qgetenv("ESRI_TOKEN");
+
+    if (!mapboxMapID.isEmpty())
+        parameters["mapbox.map_id"] = QString::fromLocal8Bit(mapboxMapID);
+    if (!mapboxAccessToken.isEmpty())
+        parameters["mapbox.access_token"] = QString::fromLocal8Bit(mapboxAccessToken);
+    if (!hereAppID.isEmpty())
+        parameters["here.app_id"] = QString::fromLocal8Bit(hereAppID);
+    if (!hereToken.isEmpty())
+        parameters["here.token"] = QString::fromLocal8Bit(hereToken);
+    if (!esriToken.isEmpty())
+        parameters["esri.token"] = QString::fromLocal8Bit(esriToken);
+
     if (parseArgs(args, parameters))
         return 0;
     if (!args.contains(QStringLiteral("osm.useragent")))
diff --git a/examples/location/places/main.cpp b/examples/location/places/main.cpp
index 8c3b64ed..a30fb857 100644
--- a/examples/location/places/main.cpp
+++ b/examples/location/places/main.cpp
@@ -90,6 +90,24 @@ int main(int argc, char *argv[])
     QVariantMap parameters;
     QStringList args(QCoreApplication::arguments());
 
+    // Fetch tokens from the environment, if present
+    const QByteArray mapboxMapID = qgetenv("MAPBOX_MAP_ID");
+    const QByteArray mapboxAccessToken = qgetenv("MAPBOX_ACCESS_TOKEN");
+    const QByteArray hereAppID = qgetenv("HERE_APP_ID");
+    const QByteArray hereToken = qgetenv("HERE_TOKEN");
+    const QByteArray esriToken = qgetenv("ESRI_TOKEN");
+
+    if (!mapboxMapID.isEmpty())
+        parameters["mapbox.map_id"] = QString::fromLocal8Bit(mapboxMapID);
+    if (!mapboxAccessToken.isEmpty())
+        parameters["mapbox.access_token"] = QString::fromLocal8Bit(mapboxAccessToken);
+    if (!hereAppID.isEmpty())
+        parameters["here.app_id"] = QString::fromLocal8Bit(hereAppID);
+    if (!hereToken.isEmpty())
+        parameters["here.token"] = QString::fromLocal8Bit(hereToken);
+    if (!esriToken.isEmpty())
+        parameters["esri.token"] = QString::fromLocal8Bit(esriToken);
+
     if (parseArgs(args, parameters))
         return 0;
 
diff --git a/examples/location/planespotter/main.cpp b/examples/location/planespotter/main.cpp
index c71a6999..76b706c9 100644
--- a/examples/location/planespotter/main.cpp
+++ b/examples/location/planespotter/main.cpp
@@ -47,7 +47,7 @@
 #include <QDebug>
 #include <QEasingCurve>
 #include <QGeoCoordinate>
-#include <QtPositioning/private/qgeoprojection_p.h>
+#include <QtPositioning/private/qwebmercator_p.h>
 
 #define ANIMATION_DURATION 4000
 
@@ -162,7 +162,7 @@ private:
             progress = ((qreal)startTime.msecsTo(current) / ANIMATION_DURATION);
         }
 
-        setPosition(QGeoProjection::coordinateInterpolation(
+        setPosition(QWebMercator::coordinateInterpolation(
                           fromCoordinate, toCoordinate, easingCurve.valueForProgress(progress)));
 
         if (!timer.isActive())