diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:05:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:05:54 +0100 |
| commit | fe04f2bc8deabcd8fdf5b8c408b23bc3ce071e6d (patch) | |
| tree | 5efbefa5d0ffee681cac8d86a93f26fb20d3827c /src/plugins/geoservices | |
| parent | 741d90b31650d71d7ea7a7cc9e83b1ab36e060c5 (diff) | |
| parent | 664a83674b2bf8313763870c9eca7c4c558a14bc (diff) | |
| download | qtlocation-fe04f2bc8deabcd8fdf5b8c408b23bc3ce071e6d.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ifa572a6e1c0835e0ca6d5bf85cde1db854604cf6
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp index b45fdef1..cb8dc2be 100644 --- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp +++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp @@ -552,7 +552,7 @@ QSharedPointer<QMapboxGLStyleChange> QMapboxGLStyleAddSource::fromMapParameter(Q Q_ASSERT(param->type() == "source"); static const QStringList acceptedSourceTypes = QStringList() - << QStringLiteral("vector") << QStringLiteral("raster") << QStringLiteral("raster-dem") << QStringLiteral("geojson"); + << QStringLiteral("vector") << QStringLiteral("raster") << QStringLiteral("raster-dem") << QStringLiteral("geojson") << QStringLiteral("image"); QString sourceType = param->property("sourceType").toString(); @@ -579,6 +579,10 @@ QSharedPointer<QMapboxGLStyleChange> QMapboxGLStyleAddSource::fromMapParameter(Q source->m_params[QStringLiteral("data")] = data.toUtf8(); } } break; + case 4: { // image + source->m_params[QStringLiteral("url")] = param->property("url"); + source->m_params[QStringLiteral("coordinates")] = param->property("coordinates"); + } break; } return QSharedPointer<QMapboxGLStyleChange>(source); |