summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix plugins build dependencyPeter Seiderer2017-07-241-2/+1
| | | | | | | | | | | | | | | | | | Do not build the plugins before the dependency on module positioning for the plugin subdir position is available. Task-number: QTBUG-62098 Change-Id: Ic7473db937359f3dad47aef0ffa3671be8cbd349 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Revert "Fix dragging items out of map bounds"Paolo Angelelli2017-07-198-897/+23
| | | | | | | | | | | | | | | | This reverts commit 2ab93acd9751b3ffe2c36a4a0e37dc792686a08f. Reason being: not passing QNX6 bot Change-Id: If45fe095b6e6959f7c40e3e0ed7a14d278bbb230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Remove dead code in QDeclarativePolygon/Polyline MapItemsPaolo Angelelli2017-07-173-150/+3
| | | | | | | | | | Change-Id: I95c1d361bd6ba43a3eed5465fc2f74b7a622af72 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-178-23/+895
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.9.0 map items are clipped against the visible region. This implies that their geometry is also clipped against the visible region. This is problematic in ::geometryChanged, since the old geometry is always clipped in this way. This patch clips items against a "projectable" region instead, that is the part of the map that is in front of the camera. Since this can produce very large vertices, mapbox earcut 3rd party library is pulled in, to replace qTriangulate that only supports coordinates up to 1<<21. Task-number: QTBUG-61727 Change-Id: I7449e755a4848a2b2107c5de4e27821e3e887bfb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix Map.toCoordinate always clamping y values to 0Paolo Angelelli2017-07-172-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows to call toCoordinate also on negative y values, given that the y value is still below the horizon. If not, the y value will be clamped to the "minimum unprojectable y value", a value that is clamped to 0. Task-number: QTBUG-61813 Change-Id: I177d3b459b6eaf827daf860b7d4011511a7e76ee Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix OSM plugin not working with providersrepository.disabled = truePaolo Angelelli2017-07-071-0/+2
| | | | | | | | | | | | | | | | Provider's status was not updated when disabling the redirection. Task-number: QTBUG-61637 Change-Id: I5987cc8363f69060c5e9ed7daafaab03043e333c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Do not draw mapQuickItems if coordinate_ is invalidPaolo Angelelli2017-07-051-1/+8
| | | | | | | | | | | | | | | | | | This change also reverts a4dc11fd52f42676265cff2ff9396a7396f1ccb3 Task-number: QTBUG-61070 Change-Id: I2046356e339b5889860b3dce10627d6b736ac02f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-094-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ edd7948893fcd40a24d96b790e21d3dd028cecbe New features include: - 3D extrusions - Data driven styles - Style transitions - Bug fixes [ChangeLog][QtLocation][MapboxGL] Updated Mapbox GL Native to v1.1.0 Change-Id: Ib4f88f382dc726e4b229dfe41530034009d7c12b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add invokables to add/remove mapItemViewsPaolo Angelelli2017-08-075-2/+137
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds two new methods to QDeclarativeGeoMap, to allow users to add or remove MapItemViews at runtime. [ChangeLog][QtLocation][Map] Added methods to add or remove MapItemViews at runtime. Task-number: QTBUG-55782 Change-Id: I4e612a9476a864331f61d49dac811a8069ae010f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add QGeoPolygon to QtPositioningPaolo Angelelli2017-08-0414-16/+988
| | | | | | | | | | | | | | | | | | | | | | This patch introduces a new QGeoShape, QGeoPolygon, together with helper functions in the location singleton (QtPositioning.*) to create and convert geopolygons from QML. [ChangeLog][QtPositioning][QGeoPolygon] Added QGeoPolygon shape. Change-Id: I111c576d7428f2a953f0459d16c25eea7ab2bd7c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add setPath overload to QDeclarativePolylineMapItemPaolo Angelelli2017-08-033-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a Q_INVOKABLE setPath overload that takes a QGeoPath. This can be beneficial when a path is already available and should be set without going through javascript array conversion. This method should come handy also when pushing polyline data from C++. [ChangeLog][QtLocation][MapPolyline] Added setPath overload taking a QGeoPath. Change-Id: I6916500473865b8234b48e8df08dfb465a2a75d2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add alignCoordinateToPoint methodPaolo Angelelli2017-08-033-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method effectively extends the functionalities offered by the center qml property, allowing to set a coordinate to an item position other than the center of the item. This is useful in those applications where the center of the scene (e.g., a cursor) is not to be place exactly in the center of the map. [ChangeLog][QtLocation][QDeclarativeGeoMap] Added alignCoordinateToPoint method to QDeclarativeGeoMap. Change-Id: I68a3d12e8376b83c4c1775a3af5e2125d3e71d63 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add setBearing overload to rotate around a coordinatePaolo Angelelli2017-08-033-0/+56
| | | | | | | | | | | | | | | | | | | | | | This patch adds an overload for setBearing in QDeclarativeGeoMap to rotate the map around a specific QGeoCoordinate. [ChangeLog][QtLocation][QDeclarativeGeoMap] Added setBearing overload to rotate the map around a given QGeoCoordinate. Change-Id: I5d2428d852b0c3537f4a1cdb1925c059788c45c5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add camera capabilities + metadata to QGeoMapType/QDeclarativeGeoMapTypePaolo Angelelli2017-07-3126-145/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enriches QGeoMapType/QDeclarativeGeoMapType embedding into this object the camera capabilities for this type, that are then exposed via a new QML Type, CameraCapabilities, and custom metadata in form of a QVariantMap, that can be accessed via the new metadata property. [ChangeLog][QtLocation][QDeclarativeGeoMapType] Added CameraCapabilities and metadata properties to QDeclarativeGeoMapType. Task-number: QTBUG-58931 Change-Id: I97a8852fbb3bbac88fdbf0d47e8247ea7ed1f31e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Re-enable QGeoAreaMonitor::debug testAlex Blasche2017-07-301-1/+0
| | | | | | | | | | | | | | The test was disabled to facilitate CI integration. Change-Id: Ib61cb3a778e9134ed4fe07a98d38f438c1f22beb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Adapt tests to the new QDateTime debug output behaviorPaolo Angelelli2017-07-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Invalid QDateTimes (like the default-constructed ones) now output "QDateTime(Invalid)". Temporarily the test is disabled until qt5.git integration passes such that the QDateTime debug operator stream becomes available in the Qt CI. Change-Id: I3c461e55f0300b8bc040761b8c181fe8abf63abe Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Allow to tilt/rotate the map using the scroll wheelPaolo Angelelli2017-07-171-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows to rotate the map by using the scroll wheel in combination with the Shift key, and to tilt the map in combination with the Control key. [ChangeLog][QtLocation][MapGestureArea] Added rotation and tilt scrollwheel actions. Change-Id: I1cfdad7615258e75506802ac4f4e71413b71b8ce Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move anchorCoordinateToPoint into QGeoProjectionPaolo Angelelli2017-07-173-14/+25
| | | | | | | | | | | | | | | | | | | | anchorCoordinateToPoint functionality actually belongs to QGeoProjection. Moving it there so that it can be used in other parts of the module. Change-Id: Id135a7a4bbe14d9c83ef160682a317e3426b15ac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add virtual fetchingEnabled in QGeoTileFetcherPaolo Angelelli2017-07-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | With this, a plugin can programmatically prevent the fetcher from acessing the network. E.g., by using a QNetworkConfigurationManager. The change introduced in this patch does however not allow the user to dynamically enable/disable the fetcher's network access. For that, additional support, together with public API, is necessary. Change-Id: I8250cd3dc8d4b2c36ccf243b5ddeab2878b549b4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-0623-56/+4647
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+43
| |\ | | | | | | | | | Change-Id: I2f51a4f677d1810dcb5dc439cadbcc943cfb19ea
| | * Add changes file for 5.9.1v5.9.15.9.1Antti Kokko2017-06-231-0/+43
| | | | | | | | | | | | | | | Change-Id: I8ba700ef2d0c755c282bd2459e983983c5569f18 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: Ia3bc239d0d08c21d591f266e1aa61ded19a4c00c
| * | Android: fix resolving null locationManagerVyacheslav Koscheev2017-06-291-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I5be4c3af8cedd6755296bc9b445562549784c050 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Update binary compatibility files for Qt5.9.0 for QtLocationMilla Pohjanheimo2017-06-271-0/+4446
| | | | | | | | | | | | | | | | | | | | | Binary compatibility files updated Change-Id: Icb554c390a2c662a724d68d33909838f2a3e23e7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix build with -qreal floatPaolo Angelelli2017-06-211-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-61538 Change-Id: Ib1e5cbe1bdcfc324e3e9dcaca7045c9318a5059e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix for Plugin.required being readonlyPaolo Angelelli2017-06-202-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation clearly states that this property should be writable but it's not. Task-number: QTBUG-57419 Change-Id: I1dc93d45ddf52f2e1eee9572f153f4f19916ca2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix Mapbox plugin mixing tiles for specified map_idsPaolo Angelelli2017-06-194-21/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the handling of map_ids, preventing the plugin from picking the wrong ids when reading or writing tiles. This changes also makes the generation of map types consistent with the other plugin, with the first type having mapId of 1. Change-Id: I1562a2bbccacf11958ee22a60e9eee74faa15a2e Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix compilation error without openglPaolo Angelelli2017-06-181-0/+2
| | | | | | | | | | | | | | | | If opengl is not present, now that warnings are error, Location fails to build due to an unused ogl variable. Change-Id: Id1e9a1f4da8bc31a65e29b3dd2770250284d02bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Use QDeclarativeGeoMapItemBase objectName to create mapboxgl item idPaolo Angelelli2017-06-182-4/+5
| | | | | | | | | | | | | | | | | | | | With this patch is now possible to predict what's the layer name that the mapboxgl plugin is generating for a specific map item, if that item has the objectName set. Change-Id: I7726e44c6b0cc981d30e7725326075025f49af30 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix add/removeMapItemGroup not checking if the item is added to a mapPaolo Angelelli2017-06-183-6/+20
| | | | | | | | | | | | | | | | | | Currently these methods aren't checking if a group is already added to another map. This patch fixes it. Change-Id: I58a5e633b44abfcae5c362f8e97d4c6706869ac5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Blacklist tst_QGeoTiledMap::fetchTiles on b2qtPaolo Angelelli2017-06-171-0/+2
| | | | | | | | | | | | | | | | | | This test has, in the last week, started to fail more often than not. Since it's very likely to be a CI problem, blacklisting it for now. Task-number: QTBUG-61485 Change-Id: Ifb68274f83b7ecc1652394623454230b527b2002 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Fix MapQuickItems w/o zoomLevel sticking around when behind the cameraPaolo Angelelli2017-06-141-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the case when rendering a map with MapQuickItems in it that have the zoomLevel property not set and using a tilting angle. Without the patch, in some scenarios the items may stick around on the screen while they should simply go away. Change-Id: Ic485ecf5851d27a0248ff1745ae552bbb81423ba Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix for QDeclarativeGeoMapCopyrightNotice crashing the applicationPaolo Angelelli2017-06-142-6/+16
| | | | | | | | | | | | | | | | Some pointers were used without prior check. This adds checks where necessary. Change-Id: I82e01b72fd3a46a6add7cf286e81686b686b272b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix Map.addMapItemGroup documentationPaolo Angelelli2017-06-121-3/+1
| | | | | | | | | | | | | | Items in map item groups are not reparented anymore. Change-Id: I1d083bf8cba5aa46e8640c175bf90aa9f04b69aa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix for GeocodeModel documentationPaolo Angelelli2017-06-091-3/+3
| | | | | | | | | | | | | | Links to Location QML element are broken Change-Id: Iffda8fd8c8cdd9e00e45592ee2f0e971865defb9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix incorrect Map.visibleRegion when all the map is visiblePaolo Angelelli2017-06-091-1/+11
| | | | | | | | | | | | Change-Id: I9d532416e0e6dd06f84216d97bcf160e3e8e43be Task-number: QTBUG-57690 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Update QtPositioning qmltypes definitionPaolo Angelelli2017-06-091-3/+27
| | | | | | | | | | Change-Id: Ic45f7c8aa819d373e96cf60082fcda95a63f79b8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix for non-existing QtPositioning 5.9Paolo Angelelli2017-06-081-4/+4
| | | | | | | | | | | | Change-Id: I5190564ef3e4a25f1e387c8918ec269a0a52bbea Task-number: QTBUG-61266 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-303-9/+8
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Support requesting traffic-aware routing from MapboxPaolo Angelelli2017-06-071-6/+13
| | | | | | | | | | | | Change-Id: I1c09d5a4d34fdb642ed38b32d9e01cf55802195f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add TrafficFeature to QGeoRouteRequest/RouteQueryPaolo Angelelli2017-06-075-2/+8
| | | | | | | | | | | | | | | | [ChangeLog][QtLocation][QGeoRouteRequest/RouteQuery] Add TrafficFeature to the query features. Change-Id: I50243865da97e302943f43b0eda430e9d8383880 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add QGeoPath::sizePaolo Angelelli2017-06-074-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | A way to retrieve the size of the path is missing, as the path property turns out not to be accessible to QML. This patch adds a Q_INVOKABLE method to expose it. [ChangeLog][QtPositioning][QGeoPath] Add ::size() to QGeoPath to retrieve the number of coordinates in the path. Change-Id: Ifa7a640113cba71f23e36626a84c8b2fe473a07e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-07157-729/+1983
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/geoservices/geoservices.pro Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
| * Update QtLocation qmltypes definitionAlex Blasche2017-06-061-3/+163
| | | | | | | | | | Change-Id: I675167f90579f9999d3e1d3cba42951bd5b7ea3b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix for incorrect QGeoPathPrivate::containsPaolo Angelelli2017-06-062-4/+4
| | | | | | | | | | Change-Id: I4067d6df69aad0af9495a29532a34f0a7e992596 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add unnecessary break to keep GCC 7 happyThiago Macieira2017-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | Falling through or breaking have the same effect, since the next case label repeats the same condition in the "if", which must necessarily be false for the code to have fallen through. qdeclarativesearchresultmodel.cpp:632:9: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c48127381f219d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add mean to create qgeopath in locationsingletonPaolo Angelelli2017-06-053-0/+73
| | | | | | | | | | | | | | | | | | As currently there is no way to create a pre-filled qgeopath, this patch adds an overload to QtPositioning.geopath() to pass parameters to the constructor. Change-Id: I05af4dbef07bd62e9e2eace7105b5255e8a392fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix documentation for return types from QJSValue to the actual QML typePaolo Angelelli2017-05-313-3/+3
| | | | | | | | | | Change-Id: I6db1f0db07de3bb9446f0b04ea95f34b56acf805 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix build when OpenGL is disabledThiago Marcos P. Santos2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | Make OpenGL a requirement for the Mapbox GL plugin. Task-number: QTBUG-61087 Change-Id: I8d8224f14fdff01c03d48991c4ff704d74e70234 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status