summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Do not create error when mapgl submodule is not checked outAlex Blasche2017-02-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I7251226b520bd3b296071c90420c648ac720cc2a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Make QGeoCameraCapabilities independent of the enginePaolo Angelelli2017-02-285-12/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to change QGeoCameraCapabilites at runtime, when the map type changes, to accommodate for those plugins that offer different maps having different capabilities. This is then used to properly push the min/max zoom levels for each map type in our OSM plugin. Autotests are included. Change-Id: I48532da77ffb3eaf2e752561395945c3a2c21985 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix incorrect method invocation in QPlaceSearchReplyOsmPaolo Angelelli2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | A previous change removed the QPlaceReply:: prefix on setError, now causing to recursively call itself endlessly. This patch reverts the change. Change-Id: Iacf704760c970fab44490897ca1192b817814b83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Warn when mapbox-gl-native submodule is not presentThiago Marcos P. Santos2017-02-241-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | If the mapboxgl plugin can be built (i.e. compiler support, opengl, etc is in place), fail the build if the submodule is not checked in and print a message on how to fix it. If the plugin is not supported, ignore it completely. Task-number: QTBUG-58939 Change-Id: I7fc05567921cd31fc26fa540ba5806f676e015fb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Better dependency tracking when building 3rdparty modulesThiago Marcos P. Santos2017-02-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make the component using the 3rdparty module depend directly on the module instead of depending on the 3rdparty directory as a whole. This will speedup compiling time when doing parallel builds and make build more consistent when building only selected pieces of QtLocation. Task-number: QTBUG-58943 Change-Id: I95b5ef8302109fb0c5fad760027a7a53d021bfa4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix support for MapParameters on Mapbox GL pluginThiago Marcos P. Santos2017-02-176-333/+872
| | | | | | | | | | | | | | | | | | | | Mapbox GL plugin can now accept MapParameters, such as MapParameters used for the Mapbox runtime style API, allowing runtime changes on the map, not restricted only to style, but also adding new geometries and features. Change-Id: If0394bd044a2d3058fe5480966880a1055614ea2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Move mapboxgl.use_fbo to the mapboxgl.mapping namespaceThiago Marcos P. Santos2017-02-171-2/+2
| | | | | | | | | | | | | | Follow the pattern, as this only affects how maps are rendered. Change-Id: Ieacc3df4149fb5045b15f2cee6d4521e93de5b6e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Optional support for QSGMapboxGLRenderNodeBruno de Oliveira Abinader2017-02-166-23/+114
| | | | | | | | | | | | | | | | | | | | | | | | QSGMapboxGLRenderNode support is experimental: It doesn't support QQuickItem transforms nor stencil clipping. By default, QSGMapboxGLTextureNode is enabled. The user can select QSGMapboxGLRenderNode by setting 'mapboxgl.use_fbo' plugin parameter to 'false'. Change-Id: I3d5338990458f62fdbe7b8dc00317a85ee1ff188 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | QGeoMapMapboxGL: Fix tr()-context of warningFriedemann Kleint2017-02-151-1/+1
| | | | | | | | | | | | | | | | QObject::tr() should not be used. Amends 68b515cdff46dc1030b027a664ef5f3f6cde946a. Change-Id: Id22f730d9bd09c41a22783d1b5530835e9fb0d1c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Support for Mapbox GL Native rendering of QML Map{Polygon,Polyline} itemsBruno de Oliveira Abinader2017-02-144-110/+327
| | | | | | | | | | | | | | | | | | | | | | | | Replaces Mapbox GL Native annotations with runtime styles API. Missing: - Map{Polygon,Rectangle} border width property - see QTBUG-58872 for details. - MapCircle support - see QTBUG-58869 for detais. Change-Id: I77c9daee813a63efc60104f94f440f00ac3cf70f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-141-7/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp Change-Id: I2428d360c07b55ec5ee61f81c6f97b3d7b20f363
| * Fix HERE Plugin requesting invalid range when on high dpi modePaolo Angelelli2017-02-081-8/+12
| | | | | | | | | | | | | | Apparently HERE does not support ZL 0 and 20 when using 512x512 tiles Change-Id: Ic52f98648243ce866646d921e3fc70b494fed62c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Default style for the copyright defined on the pluginThiago Marcos P. Santos2017-02-139-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | The Mapbox GL plugin defines a logo image on the copyright notice that needs styling in order to have an appealing look and feel. The default style is empty, so we need to fetch one for the plugin to make this work. Task-number: QTBUG-58601 Change-Id: Ib3f7d7d7fcb2797c6381fc862ce7513b516c9ff5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | mapbox-gl-native and mapboxgl depend on opengl (attempt 2)Liang Qi2017-02-131-1/+1
| | | | | | | | | | | | | | | | | | This amends c3eb798dc7b4e82b86169533ae59648205d88d48. Task-number: QTBUG-58807 Change-Id: I1bd0785331d9b66420758023c73100e04fa01658 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | QGeoMapMapboxGL: Fix tr()-context of warningFriedemann Kleint2017-02-131-1/+1
| | | | | | | | | | | | | | | | QObject::tr() should not be used. Amends f5021281c56b660b81d0122608ca9b577889f99e. Change-Id: I5eb56f462bbf9894585acc563f911c02b3f70dc5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | mapbox-gl-native and mapboxgl depend on openglLiang Qi2017-02-131-8/+10
| | | | | | | | | | | | | | Task-number: QTBUG-58807 Change-Id: I64f66024e83eaf6414a80085ef98d1ad041464dd Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add a default development token for Mapbox GL stylesThiago Marcos P. Santos2017-02-082-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea here is to have a map working zero conf, without having to create a token. Useful for developers that want to try Mapbox GL maps without creating an account. The token should not be used in production (and will display a warning telling so). It is subject to change, throttling, etc and also a violation of the ToS. Also fixes runtime exception when access token is not set on mapbox:// style. Task-number: QTBUG-58599 Change-Id: Ie7205ccbdb3ccaee753b04116aed0f5ba35f8522 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix Mapbox GL plugin not being bundled on AndroidThiago Marcos P. Santos2017-02-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make the plugin dependencies explicit and visible so androiddeployqt can see it and add them to the bundle. Only dependencies that are exclusively used by Mapbox GL need to be visible, the others are already exposed by Qt Location. Task-number: QTBUG-58589 Change-Id: Ia2bd2109f49e1305a9868e288a390979622db311 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-021-0/+3
|\ \ | |/ | | | | Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2
| * Fix for index OOBPaolo Angelelli2017-01-271-0/+3
| | | | | | | | | | | | | | Adding a range check to prevent an index OOB error. Change-Id: I9d2d13f27755511893a0731f3cf0bb934b0a8795 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add support for native polylines in Mapbox GL pluginBruno de Oliveira Abinader2017-01-314-0/+188
| | | | | | | | | | Change-Id: I14240e095bb6260d56925c026cf78fc1a3ceacdb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Re-enable the Mapbox GL 3rdparty and the pluginThiago Marcos P. Santos2017-01-312-2/+16
| | | | | | | | | | | | | | | | It was previously disabled so we could move the 3rdparty package to a more consistent location. Change-Id: I9ebd8c8fe131b2821aa3205e0deda87e9e9db19c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Momentarily disable/remove Mapbox GL 3rdpartyThiago Marcos P. Santos2017-01-313-34/+0
| | | | | | | | | | | | | | | | | | We are moving it to a new directory, but seems like the CI bots are not happy with moving a submodule, so we will remove and then add again in a new location. Change-Id: I66a251fd567ebdb8864d3afaaef1a9a663c7b106 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add color and style properties to QDeclarativeGeoMapCopyrightNoticePaolo Angelelli2017-01-312-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds two new properties to the MapCopyrightNotice element to allow changing the background color and content style of the notice. backgroundColor controls the color of the background of the element. styleSheet, on the other hand, sets a stylesheet to the html, which allows to change color, font and size of the html. To make this work, the html output from the plugins has to be properly enclosed in <body></body> tags. Change-Id: I776f78f4b26b5b2cf04510a9fbc6302334b09c61 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix Mapbox GL plugin not rendering when reloadedThiago Marcos P. Santos2017-01-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The code was using a 'static' flag for checking if rendering on a separated thread, and thus, force the map refresh. Side effect is this code path was only accessible once per application run once the check was performed. Make the flag a member attribute instead, so the flag is reset on every new QGeoMapMapboxGLPrivate instance. Change-Id: I7f2bbf2f0f21e45b9f470976cf8e7878a0f0c6f8 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Mapbox GL plugin for QtLocationBruno de Oliveira Abinader2017-01-3013-0/+876
| | | | | | | | | | | | | | | | | | | | | | | | Add Mapbox GL as a plugin for rendering vector tiles using OpenGL. Patch by: - Bruno de Oliveira Abinader <bruno@mapbox.com> - Thiago Marcos P. Santos <thiago@mapbox.com> Change-Id: I1671ae4dba0891e280a327543f15e73de1df385d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add rotation/tilting support to QGeoTiledMapScene/QGeoCameraTilesPaolo Angelelli2017-01-264-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds rotation and tilting support to QGeoTiledMapScene and QGeoCameraTiles. It also adds the related capabilities to the geoservice plugins mapping managers QML Api is added in a separate patch Change-Id: I3de1b52a9928c4856f6ee57ad39191acebe0f770 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
| * Prevent destroying QGeoTileProviderOsm before QGeoFileTileCacheOsmPaolo Angelelli2017-01-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parenting QGeoTileProviderOsm under QGeoMappingManagerEngine puts them at the same level in the qobject tree as QGeoFileTileCacheOsm. Since the latter uses the providers in the destructor, it might end up calling the destructor with providers already destroyed. This patch parents the providers under the file tile cache, so that they will be destroyed after the cache. Task-number: QTBUG-58124 Change-Id: Id2fc04da58e1ba9c80a4b6c4ebeaf98cccc7d872 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QGeoProjection to QWebMercatorPaolo Angelelli2017-01-161-2/+3
| | | | | | | | | | | | | | | | | | | | QGeoProjection is currently a class containing only static methods for WebMercator conversion/interpolation. This patch renames it to QWebMercator, effectively freeing the QGeoProjection name for a real projection class Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-0521-734/+958
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri src/location/maps/qgeomap_p_p.h src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp src/plugins/geoservices/osm/qgeoroutereplyosm.cpp Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-2812-682/+577
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-2412-682/+577
| | |\ | | | | | | | | | | | | Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
| | | * Update "nokia" geoservices plugin to use HERE APIsChris Adams2016-11-1611-675/+577
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old Nokia URL endpoints are being deprecated. This commit updates the "nokia" plugin to use the modern HERE API endpoints. It also removes the (now nonexistent) China-specific URLs. Change-Id: Ieaf75cef1538d0ebb6a22623fc041ab504cf491f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * Remove duplicated but otherwise harmless codeAlex Blasche2016-11-081-7/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I35f53f136ba6a4c7d62a82f41ee193963159a392 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Add cache cost strategy parameters to all geoservice pluginsPaolo Angelelli2016-11-243-3/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the possibility to change the cost strategy on all the geoservice plugins Change-Id: I0903d931ea228cc468216780fb87b466bc383063 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Improve support for unitary tile cost in QGeoFileTileCachePaolo Angelelli2016-11-231-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for separate caching mode for each of the three caches, disk, memory and texture. It also adds separate plugin parameters to the mapbox plugin to control the functioning of each of these cache. By default it only sets the disk cache to unitary, to comply with mapbox TOS, and leaves the other two caches to bytesize behavior (old beavior). Change-Id: I665d40568f4e69a836d7489e1daa2d8dcb8987af Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Add support for unitary tile cost in QGeoFileTileCachePaolo Angelelli2016-11-221-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for unitary pricing of tiles in the disk, memory and texture caches. This is done through a new enum in QAbstractGeoTileCache, "CostStrategy" having two values, Unitary (new one) and ByteSize (the old way). Using Unitary instead of ByteSize gives, as advantages: - the ability to comply with the TOS of certain providers, who allow to cache a fixed number of tiles, and not of bytes. - even performance with different types of tiles, like lo vs hi res, indexed vs satellite (which usually compresses much less). This patch sets the Unitary mode to be the default for the mapbox plugin since Mapbox is one of the providers whose TOS limit the amount of cacheable tiles. Therefore, the patch also modifies the mapbox plugin ".mapping.cache" parameters to reflect the new behavior. Since these parameters have been introduced with 5.8 (which is unreleased), the change doesn't need to be backward compatible. Change-Id: I76edd43900242885f24eb9f28e8c833538647edc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Renaming QGeoMapPrivate::changeMapSize to changeViewportSizePaolo Angelelli2016-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current name of this method generate confusion, as what it does is changing the size of the final element in the application, and not the actual map size. This patch renames this method to changeDisplaySize It also renames QGeoMap::setSize to setViewportSize, as well as ::size to viewportSize , width to viewportWidth and height to viewportHeight, to make everything consistent and self-explanatory. Finally it also renames minimumZoomAtMapSize to minimumZoomAtViewportSize. Change-Id: I7c1ca8bb3ca3d6f6b0fe6fc881b9300db7110527 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix mapbox map loading in offline modeKatja Marttila2016-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in offline, tiles are parsed from cache using filename. Parsing was done incorrectly for mapbox as it assumed that mapbox does not have full comma in filename which it does. Task-number: QTBUG-57011 Change-Id: I731950dc5ef8780ffe75e239462840068afa5f53 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Evict obsolete provider data on init()Paolo Angelelli2016-11-085-41/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During initialization, this patch makes sure that the cached tiles belong to the provider currently in use by using the file lastModified() value and comparing it against the (optional) Timestamp in the provider records. If this value is not present in the provider record, or if it is older than the newest modified file, the data is untouched. This operation is performed separately for each map id. This method isn't perfect in all use cases, though. E.g., if we are forced to shut down one of the provider and run on the hardcoded fallback, which has an older TS. These are however rare edge cases that most likely won't happen in practice (in the case above we could put the content of the hardcoded provider in the remote json files too) Change-Id: Ie29cf05c1fbc835ce4e3363fc0caa38a97800214 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Refactoring: removing m_reply from GeoReply classesPaolo Angelelli2016-11-2933-640/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to simplify the code removing the contained m_reply from all the Geo[Map,Route,Geocode,Places]Reply classes. The need for m_reply was associated to the "abort" method, but this can be solved by emitting a signal in the superclass abort() method, and connecting that to QNetworkReply::abort() in the constructor. Since QNetworkReplyHttpImpl always sends an OperationCanceledError it should then be safe to call deleteLater() on the network reply in the slot connected to QNetworkReply::error This patch also prevents the series of "QCoreApplication::postEvent: Unexpected null receiver" warnings that are generated due to deletingLater already deleted objects (abort() emits an error, the reply is destroyed inside the onError slot, but also in the abort() method). Finally, this patch removes the setFinished() call in QGeoRouteReply::abort() since the documentation does not mention this, and all the subclasses do not perform this operation and emit the corresponding signal. tst_qgeoroutereply has been adapted accordingly. Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-11-034-325/+37
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3598004c8d947f42c499137c7767cfcb91643082
| * | | Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-024-325/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| | * | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-11-023-324/+36
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
| | | * Return only one route from osm pluginPaolo Angelelli2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until we figure out a way to deliver also the id of the route from the RouteModel, it's better to return only the first route or otherwise it's hard, in the mapItemView to either create only one delegate or treat delegates after the first differently Change-Id: Ibaa92ce93349619a31c105546ee9c3ff760c5b0b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * Add OSRMv5 support in osm pluginPaolo Angelelli2016-10-063-323/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the OSRMv5 protocol (the only one currently available on the OSRM demo server router.project.osrm.org). Support for the old v4 protocol is retained, in case of users who supply their own osm.routing.host parameter pointing at a self hosted OSRMv4 server. The support for OSRMv4 and v5 has been moved away from the osm plugin and into the location module because this should be used in the mapbox plugin in a subsequent patch (the routing support in the mapbox plugin currently uses the text direction coming from the server, which does not support i18n) Task-number: QTBUG-56119 Change-Id: Id30fd536c7fd434011795f643221f55becfc9e18 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-011-1/+1
| | |\ \ | | | |/ | | | | | | | | Change-Id: I0880e4aa40fbf9fe0bb639f7fd77a52044e91a6e
| | | * Update here plugin routing base addressPaolo Angelelli2016-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the routing base address from the old @nokia.com address to the current @here.com one Change-Id: Ibd8cb1671776cfad57484328d1e636a7ac190ebe Task-number: QTBUG-56099 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Request alternate routes to mapbox routing APIPaolo Angelelli2016-10-121-4/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | This patch adds support for requesting alternate routes in the mapbox plugin Change-Id: I26b2b3ab8594d6de429f31d8e1e68c98f2d82a17 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>