summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Set parent to timers in position pluginsVyacheslav Koscheev2017-02-074-4/+4
| | | | | | | | | QTimer can be started and stoped only from owner thread. So, if we'll do moveToThread for parent object, then we need QTimer to have a parent to change its owner thread too. Change-Id: Iac57d42b6e72118f31d93f15662403f681925f88 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Binary compatibility file for qtlocation (5.8.0)Milla Pohjanheimo2017-02-061-0/+4425
| | | | | | | Added binary compatibility file for qtlocation Change-Id: Iffeb7e66db62cba2935637e697ddb67798978a1c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* 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>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-265-11/+81
|\ | | | | | | Change-Id: Iba6c7c58e28598c261eafb5b52b4834eb2f0aed4
| * Update QtLocation and QtPositioning QML versions for 5.8 releasev5.8.0-rc1v5.8.05.8.0Alex Blasche2016-12-074-11/+11
| | | | | | | | | | | | Change-Id: I780c23ae48c548e799c853cd3a5ac1aa77586839 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Add changes file for 5.8.0Alex Blasche2016-12-071-0/+70
| | | | | | | | | | Change-Id: Ifbf824e130a64cbfeeab4f0fde2edaef4f862d11 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | 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>
* | Fix stringsJarek Kobus2017-01-091-4/+4
| | | | | | | | | | | | Change-Id: I3148a5379561eb9d741fadfc6e6f6976a117d1c5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | Change-Id: I73d968a41e389b39b8001e2b1930673cf9733255
* | Do not use 'state' property in mapviewerMichal Klocek2016-12-202-5/+5
|/ | | | | | | | Using 'state' as property is considered bad practice and it can lead to undefined behavior. Change-Id: I3a77c4849a9e68334958216200d6c469b8f3d064 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-2818-699/+655
|\ | | | | | | | | | | | | Conflicts: src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-2416-698/+610
| |\ | | | | | | | | | 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>
| | * Fix for QDeclarativeGeoMap::fitViewportToGeoShape and QGeoRectanglePaolo Angelelli2016-11-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation fails to fit if the QGeoRectangle shape crosses the dateline. The problem does not happen with QGeoCircle. This patch fixes the problem. Change-Id: I043e9ff433f81a07f434112fe19449aec7ec94f6 Task-number: QTBUG-57027 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>
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-14/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I87087feffb23cf5553a6bb56bf8723924c4f2b14 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * winrt: Use backend provided timestampsMaurice Kalinowski2016-11-041-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IGeoCoordinate does provide a timestamp in system time. This value should be used to provide a timestamp to be forwarded to the user. In case the information provided is invalid, an invalid QDateTime is used for the position update. Task-number: QTBUG-56623 Change-Id: If476b41e5fd183edf33742d8e4401236a32c6037 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Avoid qmake warning about missing private header noteAlex Blasche2016-11-031-0/+11
| | | | | | | | | | | | | | | Change-Id: Iec1652e68a8170f3064f1ff345085ece2867c1f3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-242-1/+45
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/maps/maps.pri Change-Id: I066bcc5480de93fc627a30aa13f0392d64e36b84
| | * | Add changes file for 5.7.1v5.7.15.7.1Jani Heikkinen2016-10-311-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5eb41501cd090e43fc454224ee75a487c33fcc25 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7.1Liang Qi2016-10-1213-326/+1903
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/maps/maps.pri Change-Id: I08158c8ba03d9345097cc4017556971ba3ec0dc6
* | | | | Add cache cost strategy parameters to all geoservice pluginsPaolo Angelelli2016-11-246-10/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Fix for Unitary cache strategy supportPaolo Angelelli2016-11-242-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the population phase of the cache to support unitary strategy. It also prevents a possible divide-by-zero error. Change-Id: I4ab18041f8e908bd60eb581663fe34fbb01c4991 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Improve support for unitary tile cost in QGeoFileTileCachePaolo Angelelli2016-11-235-36/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-27/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2214-50/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Add Q_LOCATION_PRIVATE_EXPORT to QGeoMapPrivatePaolo Angelelli2016-11-223-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch privately exports QGeoMapPrivate, effectively making it possible to subclass QGeoMap directly. Change-Id: Ib373eff5ab6782c832464d2df3484d2790ea3644 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Update Esri docGuillaume Belz2016-11-161-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add details about license and ArcGIS Runtime SDK for Qt. Change-Id: Ic20f4847db12eb15a9b2e77cff3a363390b28c28 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Remove unused local variable from qdeclarativepolylinemapitemPaolo Angelelli2016-11-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lastPoint is currently unused in QDeclarativePolylineMapItem::updateSourcePoints. This patch removes it. Change-Id: I03c2f188aa417d4dc199cf0f8abd0618c19232d1 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-088-49/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Fix the direction of arguments in signalsThiago Macieira2016-11-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signal arguments are "out", not "in". There was a bug in qdbusxml2cpp that required the wrong one (in), but it's been corrected. Adapt so qdbusxml2cpp doesn't print annoying warnings. Change-Id: Ic46ff326a6ba46bc877cfffd148321381b15ae19 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-0220-351/+1941
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| * | | | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-11-0215-329/+1906
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
| | * | Skip failing autotests due to flick signals not being emittedPaolo Angelelli2016-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the combination of mouseClick/mouseMove/mouseRelease is not able anymore to produce consistent flicking. This makes some autotests fail, however manually using a mouse succeed to make the flickable flick. For this reason this patch skips the failing autotests for the moment until the root cause is found Task-number: QTBUG-56679 Change-Id: If5b24ae50eca5e7f1e4d8f2d38bc7e4183c60903 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Compilation fixVyacheslav Koscheev2016-10-281-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | minimumZoomLevel() returns qreal, qreal can be float Task-number: QTBUG-56715 Change-Id: I7a5b5667b1c50518a216c401d97104b1909632df Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
| | * 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-0613-325/+1902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-013-16/+20
| |\ \ | | |/ | | | | | | Change-Id: I0880e4aa40fbf9fe0bb639f7fd77a52044e91a6e
| | * Fix error status for QGeoPositionInfoSourceAndroidVyacheslav Koscheev2016-09-302-15/+19
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-54844 Change-Id: I8abdbb47c883099e7749c57e5010be1aa999e373 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * 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>
| * | Fix for Map polygon not working on zoomPaolo Angelelli2016-09-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug in the calculation of the geoleftbound of map polylines/polygons Task-number: QTBUG-55535 Change-Id: I11c2d2cecfdb183944d2f2766180938efa3deef6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Fix for polylines and polygon rendering wrong at the edge of the mapPaolo Angelelli2016-09-192-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug in rendering (re)created polylines/polygons right at the edge of a map, due to not setting preserve geometry to true on geometry modifying methods (addCoordinate/setPath/etc) Task-number: QTBUG-55964 Change-Id: I94bc86e8c908bc0ab4a949d96094988ed7ea26a7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Fix symmetry of streaming in QDataStreamThiago Macieira2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | If one uses int to stream in, then use int to stream out too. Change-Id: Ic46ff326a6ba46bc877cfffd1483206384439f78 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Use QDateTime::currentMSecsSinceEpoch() instead of currentDateTimeThiago Macieira2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | More efficient if all you want is the number of seconds. Change-Id: Ib57b52598e2f452985e9fffd145a37062ee3e001 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Convert qtlocation to the new configure systemLars Knoll2016-10-285-9/+59
| | | | | | | | | | | | | | | | | | | | | | | | And clean up the code detecting gypsy and the WinRT positioning API. Change-Id: Ic561d565d6fc733703ef6c0dc164e737e0b3d4fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | 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>
View Lorry Controller Status