diff options
-rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 5 | ||||
m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
-rw-r--r-- | src/location/doc/src/plugins/mapboxgl.qdoc | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 90d85e62..d49258a2 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -5,6 +5,11 @@ QT += qml network quick positioning location CONFIG += qtquickcompiler SOURCES += main.cpp +# Workaround for QTBUG-38735 +QT_FOR_CONFIG += location-private +qtConfig(geoservices_mapboxgl): QT += sql opengl +qtConfig(geoservices_osm): QT += concurrent + RESOURCES += \ mapviewer.qrc diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject a2120304a881507ed60c3199925946c1df06b44 +Subproject 572822c8ca15be190b43afbf7f91d132e988bf2 diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc index 6593a9e3..8ad6a9c2 100644 --- a/src/location/doc/src/plugins/mapboxgl.qdoc +++ b/src/location/doc/src/plugins/mapboxgl.qdoc @@ -109,6 +109,12 @@ The following table lists optional parameters that can be passed to the Mapbox p but the offline database must be populated using the \l {https://github.com/mapbox/mapbox-gl-native/blob/master/bin/offline.cpp} {offline tool}. The offline database will work alongside with the ambient cache in the same file. Make sure to comply with Mapbox Terms of Service before creating an offline database. + + \b {Note:} The map tile cache file name must be "mapboxgl.db". When using the offline tool, the default + output is "offline.db". For using the generated output from the offline tool, you must move that to the + proper directory, and rename it as "mapboxgl.db". The offline tool also provides the "--output" + parameter for specifying the name of the generated output. + \row \li mapboxgl.mapping.cache.memory \li Whether or not the cache should be in-memory only. Valid values are \b true and \b false. The default |