summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* winrt: Fixup for 79697d9fb63a109eb8e5098c90fd287815deb12bv5.8.0-beta1Maurice Kalinowski2016-10-241-1/+2
| | | | | | Task-number: QTBUG-56340 Change-Id: I9a3876d413d0d93d9ad74332677ff0244fb2e00a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: Code cleanupMaurice Kalinowski2016-10-241-1/+1
| | | | | Change-Id: Ibc2db9fa2e662a8be215556b0db056119340f593 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix compilationMaurice Kalinowski2016-10-181-2/+2
| | | | | | | | | 6df6c10e1af827d06a387e7422176dd310cf83be in qtdeclarative changed enum values. Change-Id: I55ffa6a2e55a63aec455db533e9d7b08a44978bb Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* 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>
* winrt: Add direction to position informationMaurice Kalinowski2016-10-061-0/+11
| | | | | | | | | QGeoPositionInfo::Direction matches to IGeoCoordinate::heading, both in degrees to true north. Task-number: QTBUG-56340 Change-Id: I9f3a5a207dd781d367096e8c04a2e3b09e64ea05 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix panActive state when last touch point is releasedFrederik Gladhorn2016-10-051-2/+7
| | | | | | | | | | | | | | When a touch interaction ends, the map would only consider the number of points, not their state. Thus when pan was active, it would always stay active, because in the release event, the number of points is still at least one. This also requires a reset of the synthetic mouse point, since otherwise the mouse point will be copied into the list of touch points, preventing the number of points to ever go down to zero. Change-Id: I9821d09d75f883d01eb38b741e2b5658036be334 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* QDeclarativeGeoMapItemBase::childMouseEventFilter: Do not eat release eventsFrederik Gladhorn2016-10-051-11/+7
| | | | | | | | | | | | | | | | The filter can lead to events outside of the item being "dismissed" or rather sent the the map item. When testing with MapRects, when dragging a map rect fast, I would sometimes get release events outside of the map rect, which would then end up being deliverd to the QDeclarativeGeopMapItemBase subclass. This effectively prevents MouseAreas inside of the GeoMapItem from receiving their release event. That in turn breaks follow up events to said items. While I still consider this extremely evil and bad behavior, at least this doesn't completely break event delivery any more. Change-Id: I228d64e04140e2434779d07d8f03a8e9f2d11f83 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix cache mixing with high-dpi and low-dpi osm providersPaolo Angelelli2016-10-0520-34/+373
| | | | | | | | | | | | | | | | | 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>
* Remove a bunch of ungrabTouch/Mouse callsFrederik Gladhorn2016-10-041-15/+0
| | | | | | | | | | | | | | | | | | Ungrabbing means actively not wanting to receive any future events. With slight changes in the event delivery in Qt 5.8, this leads to release events not being delivered to the items, which in turn means that the map thinks it's pressed after the last touch is gone. There is no reason to call ungrab at all, when an event ends in a regular way (release/cancel). The only reason to ungrab is when for some reason future move/release events are unwanted, in which case the item needs to make sure it's in the right state (as in not expecting release events to follow). Task-number: QTBUG-56213 Change-Id: Ieb8dbf4d8ab312cff461c4fe8a3621af67a132b9 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix typoFrederik Gladhorn2016-10-031-1/+1
| | | | | Change-Id: I914aa8463395f3473fa0c9f060b5216a9e0bab56 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
* Remove dead codeFrederik Gladhorn2016-10-031-5/+0
| | | | | Change-Id: I5aa31198e0d5a65ccc45bb57cef266a167a1cd48 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
* Add missing panActiveChanged after flickingFrederik Gladhorn2016-10-031-0/+1
| | | | | | | | While flicking, the map is in motion, so reporting pan as active is OK, but when the flick is done, emit the state change signal. Change-Id: I7978471ada11e0b69ca57d6d73faf7b2e3335232 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
* Fix struct/class mis-matchFrederik Gladhorn2016-09-291-1/+1
| | | | | Change-Id: Ia979525691781a08503ba91df42db12db6408e89 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Making mapbox plugin parameter names more consistentPaolo Angelelli2016-09-262-21/+27
| | | | | | | | | | 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>
* Document licenses of Qt LocationPaolo Angelelli2016-09-237-82/+51
| | | | | | | | | | | | Add qt_attribution.json files for 3rdparty code in Qt Location, and list the attributions in the index file. Also document the different licenses the module is available under as a whole. The _legal.qdoc files apparently weren't included anywhere, and have been removed. Change-Id: I56e8b75ae044954c745b2fde6f7cd4c1e80ec1b3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add qtconcurrent dependency to locationPaolo Angelelli2016-09-211-0/+5
| | | | | | | | | | | | | Deploying on android fails to deploy the osm plugin, because it depends on qtconcurrent, and the android package generator apparently does not recursively resolve dependencies. One way to solve this is to make location depend on qtconcurrent on android builds, so that libQt5Concurrent.so will be added to the android package Change-Id: I781e2a0c2051cf04002c85dce669947619873aa3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add capability to ask for Location permission at runtimeAlex Blasche2016-09-212-1/+30
| | | | | | | | This is required since Android v23+. Task-number: QTBUG-55988 Change-Id: I41777cfbb6fde38dc0f8045c9320f420bb0b43a2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* 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-185-33/+38
|\ | | | | | | Change-Id: I5bcca8956007506362c5a96ff345e28718da584c
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-172-27/+34
| |\ | | | | | | | | | 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>
| | * Fix for broken geocoding in mapviewer with OSM pluginPaolo Angelelli2016-08-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | OSM Nominatim blocks user agents for default libraries. This patch adds a specific user agent to the mapviewer example if one isn't provided by the user Change-Id: I9bc598eec6f53b0990c7cd0fb42cf3ef7807bedb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix for wrong map center at startup in mapviewer examplePaolo Angelelli2016-09-052-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patches fixes an incorrect behavior (that is also a regression) introduced as a side effect of the no gray bands patch in the map viewer example Task-number: QTBUG-55085 Change-Id: I2078ba72e1d1588357bb2002d0c8e38b2f59253c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Doc: Remove references to Windows CEVenugopal Shivashankar2016-08-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | The platform is not supported since Qt 5.7 Task-number: QTBUG-55331 Change-Id: Iba1146abaa8b17537453c367aed2a7c58e0aacda Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | | Add geoservices plugin to support ESRI mapping servicesv5.8.0-alpha1Guillaume Belz2016-08-3129-1/+2848
| | | | | | | | | | | | | | | | | | | | | | | | [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-304-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3011-352/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-264-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Improve robustness of QML plugin loadingSimon Hausmann2016-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: I8f7864e4ead85487943ed2c4dc2ae2584005c1c9 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@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-224-4/+10
|\ \ \ | | | | | | | | | | | | Change-Id: I3280b4863a50f648ca6de2e0524eea63e6c75676
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-164-4/+10
| |\| | | | | | | | | | | | | | Change-Id: I21723590f0085ecdeaf445336084e35a7f00d3f1
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-164-4/+10
| | |\| | | | | | | | | | | | | Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e
| | | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iea1581dc1929e53d710a2fc5eedbdf560a2d225f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | | * 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>
| | | * Fix for invisible copyright notice with Holo theme on androidPaolo Angelelli2016-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The copyright notice is currently rendered using the default application palette. This patch forces the text and link colors to black and blue, since the notice is always shown on top of the map and other colors may not work. Task-number: QTBUG-54964 Change-Id: Icc8832124cd64d5326e0aa7540e3287c4325d31d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * Fix accessing a MapPolyline delegate before it is handed over to MapPaolo Angelelli2016-08-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativePolylineMapItem::path() currently retrieves a QQmlContext with contextForObject(parent). This can return a null context if the parent is null. This patch changes the parameter to the this pointer, returning the context for the object itself. Task-number: QTBUG-55081 Change-Id: I48d6abd8be1b3d9505e37338da2b64812375374c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | 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>
* | | QDeclarativeGeoMap::sendTouchEvent: fix compilationSimon Hausmann2016-08-121-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit eb238e2cf9013f9a6cd20af0a59180896abdc377 got rid of QQuickWindowPrivate::itemForTouchPointId by keeping track of the grabbers in the event points. Task-number: QTBUG-55229 Change-Id: Icc4bcc987937ee299a47d8aa43147adc53369f47 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@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-047-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0210-12/+103
|\| | | | | | | | | | | Change-Id: I9bfe99e7e619cbf03cda73c3df4f2f51851474ae
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0110-12/+103
| |\| | | | | | | | | | Change-Id: I4f29307985225a723304783e00a6844a1b9ee825
| | * Enable dynamic addition/removal of map types by the mapping managerPaolo Angelelli2016-07-2910-12/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2952-352/+7033
|\| | | | | | | | | | | Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-07-2832-253/+1288
| |\| | | | | | | | | | Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 02:13:17 +0000