summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix for incorrect plugin parameter handling in mapbox pluginPaolo Angelelli2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the incorrect handling of the mapbox.mapping.highdpi_tiles parameter Change-Id: I35fb5ae09dc640693c7f0d80534ad7042ca83e27 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix assignment-as-condition warningErik Verbruggen2016-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qgeofiletilecacheosm.cpp:71:12: warning: using the result of an assignment as a condition without parentheses [-Wparentheses] if (tt = getFromOfflineStorage(spec)) ~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ qgeofiletilecacheosm.cpp:71:12: note: place parentheses around the assignment to silence this warning if (tt = getFromOfflineStorage(spec)) ^ ( ) qgeofiletilecacheosm.cpp:71:12: note: use '==' to turn this assignment into an equality comparison if (tt = getFromOfflineStorage(spec)) ^ == Assuming this is not meant to be a comparisson but a check if the return value is not-0, I added the parentheses. Change-Id: Ic4e14d7ea8cc5283c70d061433fe482ee4e8b38b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix override warningErik Verbruggen2016-10-061-1/+1
| | | | | | | | | | | | | | | Change-Id: If95a0099c858f57b4b26ecf86a46a748c947338d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix cache mixing with high-dpi and low-dpi osm providersPaolo Angelelli2016-10-057-21/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cache fixes the cache mixing problem that has been introduced with the osm high dpi tiles support. high dpi providers fall back to low dpi ones and ultimately to hardcoded providers (also low dpi), and can also be enabled/disabled via plugin parameter, thus leaving the cache for a given map id dirty for the next run. With this patch high dpi tiles are named differently from low dpi ones. If high-dpi providers are selected, but become not available, the cache can also change the tileset to load at runtime Change-Id: I229692da07c1fc61c58fb0b6fae6ec5af16e43a7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Making mapbox plugin parameter names more consistentPaolo Angelelli2016-09-261-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes some of the parameter names for the mapbox plugin, making the naming more consistent. The new naming starts with "mapbox.mapping." for parameters related to mapping. Change-Id: I2f185733521dfd2fb0fb7cd0b9aa08ca026b7537 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix for osm provider record fetcherPaolo Angelelli2016-09-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug introduced with the high-dpi support for osm, that caused various types of malfunctioning with the osm plugin Change-Id: I08e459059be4d8c99bd2d49b42c2502e0a5cef09 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-181-26/+31
|\ \ \ | |/ / | | | | | | Change-Id: I5bcca8956007506362c5a96ff345e28718da584c
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-26/+31
| |\ \ | | |/ | | | | | | Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
| | * Fix for multiple city tags mapping to the same fieldPaolo Angelelli2016-08-291-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for both "city" and "town" as Json document candidates for QGeoAddress::city Task-number: QTBUG-55371 Change-Id: I468207d81d61b16ea06034ea143bd3fd34df09b1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add geoservices plugin to support ESRI mapping servicesv5.8.0-alpha1Guillaume Belz2016-08-3127-1/+2674
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] Add geoservices plugin to support ESRI mapping services. Change-Id: I96fdfd9af77dc51166a9ded268bbcf0d66016fda Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | OSM: Honor min/max zoom level limits coming from the provider recordsPaolo Angelelli2016-08-303-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prevents the tile fetcher from requesting tiles with a z values that is outside the range defined in the provider record. If the provider record does not specify these values, the default values are used (0 and 20) Change-Id: I5c3f7be8bbd2b2ce6c8c8d6d8d81431237e60f5b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add OSM plugin parameter osm.mapping.highdpi_tilesPaolo Angelelli2016-08-309-348/+542
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a mean to enable/disable high dpi support for the OSM plugin too, following the same approach taken for the mapbox and here plugins. In order to do so, it has been necessary to rework QGeoTileProviderOsm. It can now be constructed with an arbitrary number of TileProviders, as opposed to the previous approach with one primary and one fallback tileprovider. It has also been necessary to disable Nearest interpolation for high dpi tiles, as it appears to produce considerable artifacts. So in presence of highdpi tiles, Linear interpolation is now always used. Change-Id: Id7d20fd5a320f3d5ef41b9fa28447a5c4f5398be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Set lowDPI tiles to be the defaultPaolo Angelelli2016-08-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since HighDPI tiles are currently causing severe performance penalties on mobile devices (at least iOS devices), this patch sets the default mode to highdpi = false. Change-Id: I2f99e3955ecccd905e8962d005421d1b5276ea84 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Remove QtSystemInfo dependency from QtLocationAlex Blasche2016-08-263-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done to detect a Chinese network operator. In such cases a different places and geocoding manager is required which takes into account the shifting of map coordinates. This requirement still exists in China but QtSystemInfo is not even a released API. It makes no sense to keep the depending symbols around. QGeoUriProvider will remain though in case Chinese customers may want to adjust this behavior. Change-Id: I5ee0edbf00cd561923457b449c5c9de675aa41d1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | MapBox: Add Linguist commentsFriedemann Kleint2016-08-221-0/+14
| | | | | | | | | | | | | | | | | | | | | Add some comments helping translators to find the right wording. Change-Id: Ie77f1020897b196668c03f472905bb47c6929d45 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Merge dev into 5.8Oswald Buddenhagen2016-08-221-1/+1
|\ \ \ | | | | | | | | | | | | Change-Id: I3280b4863a50f648ca6de2e0524eea63e6c75676
| * \ \ Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I21723590f0085ecdeaf445336084e35a7f00d3f1
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-161-1/+1
| | |\ \ | | | |/ | | | | | | | | Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e
| | | * Fix for wrong std::copy in QGeoTileProviderOsm::TileProviderPaolo Angelelli2016-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug that shows up at least on osX and iOS devices caused by an incorrect offset used in std::copy Change-Id: I09f106ddf63983365d4462e2f18a10ce44f1200a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* | | | mapbox: Deduplicate error messageFriedemann Kleint2016-08-181-4/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | Introduce helper function for translated message. Change-Id: I3249e148cb3472a2f7418771a70860b0673a8dc9 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Add HighDpi support for OpenStreetMapPaolo Angelelli2016-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This patch changes the osm providers repository to /osm/5.8/ where a provider with @2x tiles is used for the street style Change-Id: I9b2cd9e8f385506d153b9c430c1f99f7f6e7946c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Adding server side provider records for QtLocationPaolo Angelelli2016-08-057-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds to version control the files containing the provider records for qtlocation. These files should be kept in sync with what is served at http://maps-redirect.qt.io/osm/ Change-Id: Icf4ebd83818605a317f58b562df47c328a4ea7cf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Version tile cache with qt version and evict obsolete data on init()Paolo Angelelli2016-08-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the base cache directory to a new scheme containing the qt version. At the time of commit, this would be "QtLocation/5.8/tiles/" This versioning does not have to change at every release, but when there are changes in the caching scheme. The reason for this is that, otherwise, it becomes difficult to clean up old cache data. QGeoFileTileCache::init already clean up old tile cache from 5.4 or older, where the cache data wasn't organized under a directory for each plugin. In 5.8 different naming scheme are introduced for mapbox tiles (with @1x,@2x) , here maps (with ppi), and soon for OSM too (with an identifier for the actual provider, not only the mapId). With this patch it will become easier and cleaner to upgrade the cache data without leaving residues. Change-Id: I89aeac0aaf1408d119cde5792fc69a64d5d89c3a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-023-10/+48
|\ \ \ | |/ / | | | | | | Change-Id: I9bfe99e7e619cbf03cda73c3df4f2f51851474ae
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-10/+48
| |\ \ | | |/ | | | | | | Change-Id: I4f29307985225a723304783e00a6844a1b9ee825
| | * Enable dynamic addition/removal of map types by the mapping managerPaolo Angelelli2016-07-293-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map types are currently fixed in the constructor, regardless of whether they were available, or, now, whether they are enabled or not. This patch makes the geomappingmanager notify (e.g., emit a signal) when the available map types change at runtime. This is used in the OSM mappingmanagerengine, which can now disable map types if provider records turn out to be invalid or disabled after they have been fetched. Change-Id: I8e0e75504c882609f91c6d1ceb88424eee656f26 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'gerrit/5.7' into devAlex Blasche2016-07-2911-104/+868
|\ \ \ | |/ / | | | | | | Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-07-2811-101/+868
| |\ \ | | |/ | | | | | | Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
| | * Add indirection for osm providersPaolo Angelelli2016-07-2711-101/+868
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent furter breakage of qtlocation osm provider in existing qt versions, this patch introduces one level of indirection in resolving OSM providers, fetching the tile server address from files hosted at http://maps-redirect.qt.io/osm/5.6/ The content of the files requested for the server address resolution must be in JSON format, containing (currently) the following fields: { "Enabled" : bool, (optional) "UrlTemplate" : "<url template>", (mandatory) "ImageFormat" : "<image format>", (mandatory) "MapCopyRight" : "<copyright>", (mandatory) "DataCopyRight" : "<copyright>", (mandatory) "MinimumZoomLevel" : <minimumZoomLevel>, (optional) "MaximumZoomLevel" : <maximumZoomLevel>, (optional) } Enabled is optional, and allows us to temporarily disable tile providers if they go offline without firing requests to them. Default is true. MinimumZoomLevel and MaximumZoomLevel are also optional, and allow us to prevent tile requests to the providers, if they do not support the specific ZL. Default is 0 and 19, respectively. <server address template> is required, and is the tile url template, with %x, %y and %z as placeholders for the actual parameters. Example: http://localhost:8080/maps/%z/%x/%y.png <image format> is required, and is the format of the tile. Example: "png" or "jpg" <MapCopyRight> is required and is the string that will be displayed in the "Map (c)" part of the on-screen copyright notice. example: "<a href='http://www.mapquest.com/'>MapQuest</a>" <DataCopyRight> is required and is the string that will be displayed in the "Data (c)" part of the on-screen copyright notice. example: "a href= 'http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors" The patch also adds four additional OSM plugin parameters, modifies an existing ones, and removes another existing one. Removed: - osm.mapping.copyright, now removed and replaced by two other parameters (see below). New: - osm.mapping.providersrepository.address, allowing to change the hardcoded http://maps-redirect.qt.io/osm/5.6/ The implication of this parameter is that it becomes possible to use file:// urls or even qrc:, allowing to ship custom providers with the applicarions - osm.mapping.providersrepository.disabled, allowing to disable the indirection and go with hardcoded URLs by default. - osm.mapping.custom.mapcopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Map (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled - osm.mapping.custom.datacopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Data (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled Modified: - osm.mapping.host now became osm.mapping.custom.host, improving the naming consistency. Task-number: QTBUG-54599 Change-Id: Iee88883572a198c00bcf54cf2bc33fbcc0498a68 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Add routing support for the mapbox geoservice pluginVlad Seryakov2016-07-227-7/+518
| | | | | | | | | | | | | | | | | | | | | This patch adds routing support for the mapbox plugin Change-Id: Ibaf9d9d8a845b49cb8a6fc0d3530ffe57f4989db Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | OSM Geoservice plugin improvements, including offline data supportPaolo Angelelli2016-07-215-3/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains improvements for the OSM geoservice plugin, in form of property-controllable disk cache, and the support for a directory containing an offline dataset. The offline directory can contain subdirectories also in form of symlinks. If duplicate tiles are present, the newest is used. The population of the offline tiles registry is offloaded to a thread to prevent blocking the startup of the application. No synchronization is used (except on cache destruction), so that, as the tiles are being indexed, they can be used in the application. For the time being, no support is given to populate such directory (mostly due to current API limitations), but tiles can be placed manually, for example copying them from the disk cache directory. Task-number: QTBUG-45284 Change-Id: I518980669a3ee474545025adf05adc69cdd29781 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix for mapbox plugin legacy parameter supportPaolo Angelelli2016-07-201-42/+20
| | | | | | | | | | | | | | | | | | | | | | | | This patch restores the support for the legacy plugin parameter "mapbox.map_id" Change-Id: I97ccc5d1a73cd2746352b6a309dece4c3440dfff Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Differentiate cached tiles by dpiPaolo Angelelli2016-07-199-18/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses separate filenames for tiles downloaded at different resolutions/dpi. For the HERE plugin, the dpi is appeneded to the filename. For the mapbox plugin, @1x or @2x is used due to the different approach to High DPI tiles. Change-Id: I0dcda088dae84e98c0e73bdc24435d7e2a3f43f7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix for caching after mapbox improvement/highdpi-supportPaolo Angelelli2016-07-072-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the qgeofiletilecache/qgeofiletilecachemapbox contains a bug in that it makes use of virtual functions in the constructor. This patch fixes it by moving those calls into a virtual init() method that is called by QGeoTiledMappingManagerEngine::setTileCache() Change-Id: Icf7932dfbae7d99eef22c67e034246a834212a03 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | fix for not working mapIds for mapbox pluginPaolo Angelelli2016-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | | fix for not working mapIds for mapbox plugin Change-Id: Iebde6ad640c1b49296e3bd528c942f7abc98d5b6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Use HiDpi tiles to produce crisper maps at fractional zoom levelsPaolo Angelelli2016-07-016-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current QtLocation renderer uses geotiles of specified size for each specific zoom level, and show them using nearest neighbor interpolation when the camera is at that specific zoom level. Interpolation is changed to linear when the zoom level is in between two neighboring tile layers, but hasn't reached the next yet, so that the previous layer can be magnified smoothly. While this is the correct approach, it produces blurry images most of the time, while the previous camera mechanics, not allowing continuous zoom, was able to show crisp images all the time. To retain the continuous zoom and produce crisp images, this patch makes use of HiDpi tiles from providers that offer them (HERE and mapbox). The way these two providers offer HiDpi is different: HERE scales the map elements (text, mostly), to address a specific dpi (supported dpis are 72, the standard, 250, 320, 500), while mapbox returns the same tile at double resolution. The way the patch deals with this is by taking the image requested as is, but setting the tile size in the renderer to be half of that, while at the same time enabling mip mapping for QSGImageNodes. In this way, at integer zoom level, texture LOD 1 is shown, that is an OpenGL-scaled-down version of the downloaded tile, while at the other fractional zoom levels trilinear interpolation is used to produce a good image. This approach was not possible for the openstreetmap geoservice provider because mapquest (the currently used data provider) does not offer HiDpi tiles, and a scaled version of the standard tile would make the text unreadable half of the times. Further scaling would be possible, e.g., with HERE maps, offering 500ppi maps, to look good during scaling also on HiDpi devices. This can be addressed in a future patch. Task-number: QTBUG-53318 Task-number: QTBUG-48868 Task-number: QTBUG-36949 Change-Id: Iaa6f5b1ece9d37a0c85e73efaf1bd3b50b1d5950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Improve Mapbox geoservice pluginPaolo Angelelli2016-06-308-16/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds standard mapbox map modes so that they could be used out of the box without the need for specifying it as parameter, and also adds a QGeoFileTileCache to the plugin, since the Mapbox TOS allow a limited caching even in the free plan. The default cache max disk usage has been set accordingly. The mapbox.map_id parameter is now optional, meaning that things will work like before if present, but will work with the default mapbox styles if not. Change-Id: I4056a3706f47d7f5c46a873c135b743106647fc0 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | | Improving error reporting of HERE geoservice pluginPaolo Angelelli2016-06-281-1/+5
|/ / | | | | | | | | | | | | | | This patch makes the QGeoServiceProviderFactoryNokia spit clearer error messages if the mandatory parameters are present but incorrect Change-Id: I7d46409e7ea7d7517dd6c28f3679d60ebf619d5b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove QGeoMapController from QGeoMapMichal Klocek2016-03-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code to use QGeoCameraData directly. All functionality related to zoom, center boundary checks are now handled in QDeclaratvieGeoMap class. This makes handling of center and zoomLevel properties much simpler and less error prone, since camera data can not be modified along the call stack. As result we avoid forwarding change signals back and forth: * qgeodeclarativegeomap::setCenter -> qgeomapcontroller::setCenter * qgeomapcontroller::setCenter -> qgeomap::setCameraData * qgeomap::setCameraData -> qgeomacontroller::cameraDataChanged * qgeomapcontroller::cameraDataChanged -> emit qdecalartivegeomap::centerChanged Call always setCenter and setZoomLevel on qdeclarativegeomap instance instead. Introduce initialize() method to handle cases where map plugin is loaded and scenegraph geometery is not yet set. This is required to correctly handle new boundary checks to limit grey areas. Change-Id: I6066cefd4a648dc76333dc241d1f261451a32e9c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-083-12/+12
|\ \ | |/ | | | | Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-253-12/+12
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ia0fcc7b40cbd80bde8edddcf8253b3136ed851ff Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-2/+2
|\ \ | |/ | | | | Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7
| * Merge remote-tracking branch 'gerrit/5.5' into 5.6Alex Blasche2016-01-051-2/+2
| |\ | | | | | | | | | Change-Id: I0a137c8feba6c7da613b03a67d7cd4521524c58e
| | * Fix OSM based routing5.5Alex Blasche2016-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server changed the status code for a successful route retrieval to 200. Task-number: QTBUG-50240 Change-Id: I98aa444b9a10a69b6a357eb92f6b45d534b4e45d Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Updated license headersAntti Kokko2016-01-2024-336/+480
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Iaee1a5fd53291752a1891710ee375ca32778b142 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | fix expensive iteration over QMap::keys(), QHash::keys()Anton Kudryavtsev2016-01-153-12/+12
|/ / | | | | | | | | | | | | ... and QJsonObject::keys() Change-Id: I9a8ba44406a1e2cbdfffd266d2b5cb664f7440fc Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Fix route requests with excluded areasAaron McCarthy2015-11-181-8/+5
| | | | | | | | | | | | | | | | | | | | | | Due to a typo in the loop condition excluded areas were excluded from the generated request string. [ChangeLog][QtLocation][Here plugin] Fix route requests with excluded areas. Change-Id: I3f5d5bb7b4b9ab660dc0288f0ed54d02a1e7068b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove createTileCacheWithDir from QGeoTiledMappingManagerEngineMichal Klocek2015-10-271-1/+2
| | | | | | | | | | | | | | | | | | Recent change adds setter for TileCache, use new setter in here plugin, remove obsolate create function. Change-Id: I8f5ee726f6c14ea6fa2adf82a4713d5b37c6a78b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Split QGeoTileCache for easier customization of the tile cache.Harald Meyer2015-10-222-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGeoTileCache is split into two classes: The abstract class QAbstractGeoTileCache offers interfaces for inserting and getting tiles, as well as getting cache status information such as used texture memory. The new class QGeoFileTileCache implements QAbstractGeoTileCache and offers a file based caching implementation (the implementation is the same as before splitting the class). Change-Id: I2eab7491d489ac5b251c1296b67688901f5cc7d7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Isolate the default cache directoryLaszlo Agocs2015-09-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having it in several random places, have a central function that contains all the cache directory selection logic. As per QtCore docs GenericCacheLocation can be empty so introduce a fallback to CacheLocation (the app-specific, non-shared location) in case some future platform does not support the former. Task-number: QTBUG-41187 Change-Id: Icfe5e8926e917483ac11844f625244318ff815c7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
View Lorry Controller Status