summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix PluginParameter not working with script as property valuesPaolo Angelelli2017-08-235-7/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the undocumented QDeclarativeGeoServiceProviderParameter::initialized signal, to signal to the parent when a parameter becomes fully initialized, so that the parent QDeclarativeGeoServiceProvider can attach. Task-number: QTBUG-62075 Change-Id: Ie3615abf31d19f39587c5e54b202f8f2c4a711cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Fix GeocodeModel not autoUpdating if plugin attaches latePaolo Angelelli2017-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch handles the case when the plugin attaches after QDeclarativeGeocodeModel::componentComplete() has been called. Change-Id: Ib9e4991ab3a4a34730da2d55fae20a492ac9d9f2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Fix QDeclarativeGeoMap::populateMap duplicating itemsPaolo Angelelli2017-08-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since apparently children() and childItems() do not necessarily return disjoint sets, concatenating the two lists did, in some cases, cause duplicated items in the map. This patch resorts to uniting sets to remove the duplicates. Change-Id: I07ef19a2fdff65429eb65d92be278d7c02ac1999 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-225-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ bd15e273dce767458d335aeb1f50aa081390d593 Task-number: QTBUG-62454 Change-Id: I241ae47d8590a5de7da95f39ae056abeab9c172b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fixed MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Fix the filter attribute name inside the named filterJarek Kobus2017-09-011-1/+1
|/ / | | | | | | | | Change-Id: Ib19c416b07d2d14771beb1445a2209dbf8b1fa96 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Update Mapbox GL versionThiago Marcos P. Santos2017-08-221-0/+0
| | | | | | | | | | | | | | | | | | Includes the patch that removes incompatible caches when downgrading Mapbox GL to a version that uses an older cache database schema. Task-number: QTBUG-62454 Change-Id: I666777ff8a984e4acee9f585c191e7204cbbadb7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix 3D buildings not being renderedThiago Marcos P. Santos2017-08-211-0/+1
| | | | | | | | | | | | | | | | Let Mapbox GL know about what FBO is in use so it can set texture attachments properly. Change-Id: Ie70de0f449eecf1d8a1f1dec8b89e60495ca5386 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Enable tests for boot2qtSami Nurmenniemi2017-08-154-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit cc7fb64d321c4884caee0cfd29bd2de0b1b3eaeb. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Also some timings needed to be relaxed for the tests to pass when running on Qemu. Task-number: QTBUG-60268 Change-Id: I8f933511c956b728a76870231a58ed89398a75ba Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fix MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Update Mapbox GL stylesThiago Marcos P. Santos2017-08-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced deprecated styles and added new navigation styles. Replaced: - traffic-day-v1 -> navigation-preview-day-v2 - traffic-night-v1 -> navigation-preview-night-v2 New: - navigation-guidance-day-v2 - navigation-guidance-night-v2 [ChangeLog][QtLocation][MapboxGL] Updated map styles Task-number: QTBUG-62002 Change-Id: I461335b7354bf78ee5d4c380bffd72a5bfda3285 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-1022-241/+1072
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/declarative_ui/tst_map.qml Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
| * Fix routes comparisonBogDan Vatra2017-08-091-2/+2
| | | | | | | | | | Change-Id: Ie02061804efdb79911a997bd017d13ed0d65d262 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix visible region computation in QGeoProjectionWebMercatorPaolo Angelelli2017-08-094-16/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the visible region is calculated as the intersection between the viewing frustum and the map plane clipped against the map extended rectangle in mercator space (from -1 to 2 in x coords, 0 to 1 in y coords). The result is correct in the extended mercator space. However, this may lead to overlapping coordinates when converted back to latitude and longitude. For this reason, this patch changes the clipping geometry to be the map un-extended rectangle centered around the current map center. The result is a geometry that never wraps around or overlaps, thus removing the need for handling separately the case when the map is fully visible when returning the visible region. Task-number: QTBUG-57690 Change-Id: I8396c40a123ce94bff4388dfefbd8a694657b8bd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Restore usage of setProperty on Map.fitViewportToGeoShapePaolo Angelelli2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | setProperty was initially introduced with 2867f1efc989478667ea7ae56ff91cd991d74121 to animate center and zoom level, if an animation was present, but then removed. This change restores it. Change-Id: Id1f6da820b6cccb62b18eeb78d7dba21ebc073bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapFlick::test_flick_diagonal autotestPaolo Angelelli2017-08-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | init() is currently setting zoomLevel to 0. This prevents the map from flicking diagonally as there's no room for that when the map is fully visible vertically. This test is currently passing in CI for unclear reasons, but it's failing locally. Change-Id: I0bb7c703a6cd2d4b5f440ce629c3933cf41268f6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapCircle artifacts with small radiusesPaolo Angelelli2017-08-032-7/+23
| | | | | | | | | | | | Task-number: QTBUG-62154 Change-Id: I86647b0509b4682ea6fde1305834b6a86b0b6f64 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix memleak: delete QGeoMap when QDeclarativeGeoMap gets deletedBogDan Vatra2017-07-285-25/+25
| | | | | | | | | | | | Task-number: QTBUG-62122 Change-Id: I538e1eeb6bce3f5de424003b0b31fa59599dc2d5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-288-23/+901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. This patch also contains a fix for earcut.hpp to make it build also on QNX6.6 Task-number: QTBUG-61727 Change-Id: Iffc95fdae88fef982c1eb86db567b326b5e51057 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * 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>
View Lorry Controller Status