summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Document QtPositioning::geopolygon QML basic typev5.11.0-beta3Topi Reinio2018-04-032-9/+36
| | | | | | | | And revert the changes from commit acc8bc07 that erraneously converted references of 'geopolygon' to 'geoshape'. Change-Id: I8ad5c17b3ad3dcd3cec6d7ba49bfa078b87ad33d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Implement QGeoRoute{,Private}MapboxBruno de Oliveira Abinader2018-03-283-3/+66
| | | | | | | | | | | | Adds QGeoRoutePrivate::metadata(), which provides a QVariantMap containing route plugin-specific data, that could be privately used by other plugins. Taking Mapbox routes as example, we want to expose the route JSON server reply, so we've added QGeoRouteMapbox for that purpose. Change-Id: I6823ed4623b05a0e678b73676b2361cf74823ddb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Introduce setParentVisiblityBogDan Vatra2018-03-273-4/+26
| | | | | | | | It's needed to determine the item visibility without altering user-set visibility values. Change-Id: Ibc78cdbc4eab83ddf93326e58ab4d2a883de444b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Doc: Fix all documentation warningsTopi Reinio2018-03-2753-153/+200
| | | | | | | | | | | | | | | | | | | | Fix multiple warnings caused by invalid documentation configuration, missing QML module specifiers, wrong QML type names, incorrect arguments for the \fn command, and missing documentation. Remove incorrect statement from the example usage of the Waypoint QML type. Use 'QtLocation' as the name for the module throughout the docs. Clang (used as the parser for QDoc in Qt 5.11) was unable to resolve the path for qlocation.h, causing QDoc to omit the QLocation namespace documentation. Fix this by including the file explicitly from qlocationglobal.h for documentation builds. Change-Id: I2bd790db1ff5ad96f0cdb415a682b97593b3a6dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* Refactor input handling codePaolo Angelelli2018-03-232-127/+129
| | | | | | | | Fix coding style in map gesture area, and move all input handling code in the same section in qdeclarativegeomap.cpp Change-Id: I33ef572cb85ebbb446ee9ff0a1359abbe55c3dfa Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix QGeoMapItemsOverlay not overriding QGeoMap::capabilitiesPaolo Angelelli2018-03-232-0/+8
| | | | | | | As result, it won't pan any longer Change-Id: Id65be2936d628a12e2bb4c99bc119473014774c9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Declare/Register metatype for QGeoPositionInfoPaolo Angelelli2018-03-2313-21/+8
| | | | | | | | | | Instead of doing it all over the place, declare it in qgeopositioninfo.h and register it in QGeoPositionInfoSource() as well as in positioning.cpp Task-number: QTBUG-65937 Change-Id: I819af3393921bdc9ca46832d5b4181d41546dac0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QGeoServiceProvider: Consider navigation manager when setting localePaolo Angelelli2018-03-231-0/+2
| | | | | Change-Id: I2b93d477c94cba528b9b6764e69cb6363c270702 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix tst_map_mouse.qml test_basic_press_release not stealing eventsPaolo Angelelli2018-03-221-3/+4
| | | | | | | | | | | | | With 5af3f07c95e758636090ad4a928fa8e86a7b2dc6, the map gesture area does not get into active state anymore upon mouse release. This behavioral fix causes tst_map_mouse.qml(536) to fail, since clicking somewhere and releasing somewhere else does not activate the gesture area anymore. This patch adds the necessary real-life mouse move in between the two to activate the gesture area, and trigger the tested event stealing. Change-Id: I459a663f9862d0768b17a9ecd71065342917dc10 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Deprecate MapParameter, introduce DynamicParameterPaolo Angelelli2018-03-222-10/+19
| | | | | | | | Same thing, different name, more suitable for being used outside a Map element (e.g., inside MapObjects, MapItems, or Navigator). Change-Id: I79839ef42daad0347a2b760d61d4124496c56fdd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix clearData not triggering scene updatePaolo Angelelli2018-03-221-0/+2
| | | | | | Task-number: QTBUG-66880 Change-Id: I14f3d3fa933b63436dcd3034c07a5dad51f18b1f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapPolyline QQuickItem geometry to allow enabling layersPaolo Angelelli2018-03-221-3/+3
| | | | | | | | | The geometry now considers the line width, so that, when enabling layers, the item won't be incorrectly clipped at the borders. Task-number: QTBUG-38459 Change-Id: I82c1e49c914a4a1219bb1f1ec3a70ff7bfbfbcfe Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QGeoServiceProviderFactory: Restore binary compatibility to Qt 5.10Paolo Angelelli2018-03-204-8/+51
| | | | | | | | | | | | Added a new QGeoServiceProviderFactoryV2 to load plugins offering a navigation manager engine. To be able to still load plugins compiled against Qt 5.10, both factories are considered when loading plugins, using the pointer to the V2 only when accessing the newly exposed functionality. Change-Id: I8e5e868737c77142e77caaacef278686565928df Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix export for QDoubleVector2D and QDoubleVector3DPaolo Angelelli2018-03-192-4/+4
| | | | | Change-Id: I422b4e67843fe1910f85299cec437a5c7c24814d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* API Fix: expose the RouteQuery used to produce a RoutePaolo Angelelli2018-03-192-0/+19
| | | | | | | | | | | | | | Currently, Route is intended to be a one-way interface to push data into a route request. With the upcoming navigation support, there is need for this to become also a way to report to the user the updated request info, for example when, Navigator.currentRoute changes. This patch introduces a RouteQuery read-only qml property so it would be possible to access the related query data in a route, and use it in the UI. Change-Id: Ibea8cb724313606feae614c61736ee14105d1045 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QDeclarativeGeoWaypoint: Declare QQmlParserStatus interfaceFriedemann Kleint2018-03-191-0/+1
| | | | | | | | Fix warning: declarativemaps\qdeclarativegeoroutemodel_p.h(270): Warning: Class QDeclarativeGeoWaypoint implements the interface QQmlParserStatus but does not list it in Q_INTERFACES. qobject_cast to QQmlParserStatus will not work! Change-Id: I3e9d8e6a68a5bb644a9d6ded8982daffaf985c53 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* qgeopositioninfo_p.h: Add "We mean it" commentFriedemann Kleint2018-03-191-0/+11
| | | | | | | | Fix warning: QtPositioning: WARNING: .../qtlocation/src/positioning/qgeopositioninfo_p.h does not have the "We mean it." warning Change-Id: I1f36f5505316b06b22522877bf53660fdfee79b1 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Don't start panning on mouse releaseShawn Rutledge2018-03-162-1/+12
| | | | | | Task-number: QTBUG-66534 Change-Id: I72aee2235c50273fde809e67c83e0c2195db88b4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix warning: usage of deprecated QString()Paolo Angelelli2018-03-161-1/+6
| | | | | Change-Id: I584483bfce276132f167f2344ea731bb9d6da894 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* API Fix: Expose Waypoint metadata and RouteQuery extraParametersPaolo Angelelli2018-03-142-0/+54
| | | | | | | | | | | | | | Both RouteQuery and Waypoint are currently intended to be a one-way interface to push data into a route request. With the upcoming navigation support, there is need for these to become also a way to report to the user updated request info. This patch fixes the problem by adding two read only qml properties, a Waypoint.metadata, that can also be used to read all of what is being set via Map Parameters, and a RouteQuery.extraParameters, intended to be used in the same way. Change-Id: I65e484d96d50e89f44271781cb21e58dfe7badf8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* API Fix: change QGeoRouteRequest::extraParameters into QVariantMapv5.11.0-beta2Paolo Angelelli2018-03-086-13/+15
| | | | | | | | | | | | | | | | Needed as it turns out the QGeoRouteRequest associated with a QGeoRoute has to be exposed also through the declarative API (so QDeclarativeGeoRoute must expose an associated QDeclarativeGeoRouteRequest). QDeclarativeGeoRouteRequest was, until now, intended to be only a one-way API (to feed data into the plugin). Now that it has also to expose data coming from the plugin, including the associated extraParameters that do would come anymore from nested MapParameters but from the QGeoRouteRequest itself. For this reason the type has to be a QML-friently type. Change-Id: I083e0fe97ad1088f6084665037003e24edb54371 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix infinite loop in QGeoRouteSegmentPrivateDefault::operator ==Paolo Angelelli2018-03-071-1/+1
| | | | | | Change-Id: I7b92ecd1862866c3f065447d23957993057f7b8c Reviewed-by: Helio Chissini de Castro <helio@kde.org> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
* Add .mm to DISTFILES if not on MacPaolo Angelelli2018-03-051-0/+4
| | | | | | | So that the files can be found by qtcreator. Change-Id: I00b0cbcd711b413221a4486234aba8b1c5757cb6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix re-set map items rendering stale geometryPaolo Angelelli2018-03-014-8/+31
| | | | | | | | Geometries are now cleared if data is invalid, before early return. Task-number: QTBUG-66758 Change-Id: Ie89248f78b5fd817a33ed5d6ff56b3547d64a50b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* qlocationlabsglobal_p.h: Add missing "We mean it" commentFriedemann Kleint2018-03-011-0/+11
| | | | | | | | Fix: WARNING: qtlocation/src/locationlabs/qlocationlabsglobal_p.h does not have the "We mean it." warning Change-Id: Iae44606739fce82d113dfdd228a44e1911593598 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Silence a GCC 8 warning in qquickgeocoordinateanimationVille Voutilainen2018-03-011-3/+3
| | | | | | | | | qtlocation/src/imports/positioning/qquickgeocoordinateanimation.cpp:278:106: error: cast between incompatible function types from ‘QVariant (*)(const QGeoCoordinate&, const QGeoCoordinate&, qreal)’ {aka ‘QVariant (*)(const QGeoCoordinate&, const QGeoCoordinate&, double)’} to ‘QVariantAnimation::Interpolator’ {aka ‘QVariant (*)(const void*, const void*, double)’} [-Werror=cast-function-type] d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&q_coordinateWestInterpolator); Change-Id: If8728c01782177aeeb0f64a8637093d0c4c4ee2d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use mouse instead of arguments[0] in signal handlersv5.11.0-beta1Kari Oikarinen2018-02-211-21/+18
| | | | | | | | | Couldn't reproduce the bug that was the explained cause and based on the bug comments it hasn't been reproducible in Qt 5.2+ in 2014 either. Task-number: QTBUG-36560 Change-Id: I198bbba5a3f00bf49a7efbfde30af1696011efd8 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix declarative_ui::MouseArea::test_enabled failing in CIKari Oikarinen2018-02-211-1/+1
| | | | | | | | | | | | | | | | The test in the headline failed in CI on first runs, but succeeded in repeats when it is run alone. This was because the previous test declarative_ui::MouseArea::test_basic_press_release led to a situation where the mouseClick() does not actually lead to a click event. QTBUG-66534 was created to track that bug. Skip the part of the test that leads to the failure for now. Task-number: QTBUG-66533 Task-number: QTBUG-66534 Task-number: QTBUG-66216 Change-Id: Iadf3844e97603414594aceafcb1f36cf40653073 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-02-207-9/+69
|\ | | | | | | Change-Id: Ie32717a594ad7a82d1c8eee238ce378bcfadc2ac
| * Enable Qt.labs.location and locationlabs modules by defaultPaolo Angelelli2018-02-191-1/+0
| | | | | | | | | | | | | | | | | | These are experimental anyway, and to be used they have to be explicitly imported or added in a pro file. Change-Id: I7ab4391db5d3f22d8cd4c1819ca0610b8739ff7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Fix warning C4138: '*/' found outside of commentPaolo Angelelli2018-02-171-2/+2
| | | | | | | | | | Change-Id: I9be01a84ed70daaa47e2d13619060d815d6b9f3c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Use Q_LOCATIONLABS_PRIVATE_EXPORT in locationlabs modulePaolo Angelelli2018-02-145-6/+67
| | | | | | | | | | | | | | Currently it is incorrectly using Q_LOCATION_PRIVATE_EXPORT Change-Id: Ie7e92fa5ca0379c0bf89055f975da6cf958e049e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into ↵Liang Qi2018-02-202-5/+31
|\ \ | | | | | | | | | refs/staging/5.11
| * \ Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-202-5/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0786d8c91141c245f337c31ddcdfcb39e4b8ca41
| | * | Fix zoomLevel being emitted when the value has not changedPaolo Angelelli2018-02-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.setZoomLevel currently clamps the user-set value to a valid range. The current implementation emits zoomLevelChanged every time the user-set value is different from the current value. This patch restrict emission to when the actual value has really changed. Change-Id: I2096b666d2a5b1849c9022cad028b826cfee2a78 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * | Fix Map.zoomLevel not honoring user-set valuesPaolo Angelelli2018-02-122-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently m_userMinimumZoomLevel is set but not used when setting the zoom level. With this patch, the minimumZoomLevelChanged signal is still emitted when the "implicit" minimumZoomLevel of the map changes (the one derived from the map size), but only if no user minimum zoom level is explicitly set. Task-number: QTBUG-66107 Change-Id: Id7f87cbd237407b255deea90dad80eeadd2d2f0d Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * | Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic476c5cdd495d546c9421ccae2ebf15b591475ac
* | | | Fix regression: gesture area not honoring maximum center latitudePaolo Angelelli2018-02-202-1/+11
|/ / / | | | | | | | | | | | | | | | | | | Introduced in 69a42c4a5c37a5a74c4b285c64328bc88ed8e059 Change-Id: I3cace297e0494bdb4da5e6d4d1a634877c66f916 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into ↵Paolo Angelelli2018-02-202-0/+26
|\ \ \ | | | | | | | | | | | | refs/staging/5.11
| * \ \ Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-192-0/+26
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I9a9bfd9474ff4b578367cea3d7697173ec287ca9
| | * | | Bump Mapbox GL to fix issue on Windowsv5.10.15.10.1Bruno de Oliveira Abinader2018-02-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: I00038790fcfbaa3b91aee6c23e46b654b7e71ad1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | | Add changes file for Qt 5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I73ae8b057b819b822cf3a5e19ce4b62f8dd85f67 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | | Fix crash calling Map.clearMapItems before Map is initializedPaolo Angelelli2018-02-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-66315 Change-Id: I18af392a00303b3b4c515c8f557e9c3fa09657eb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Properly namespace labs plugin configure featurePaolo Angelelli2018-02-192-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also changes underscore with dashes, so that only dashes have to be used in enabling a feature in a configure line. Change-Id: I83d3412382ed2530dcd574a1c4b7bff9f20cfd6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1929-250/+599
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qdeclarativegeomap.cpp src/location/maps/qgeomap.cpp src/location/maps/qgeomap_p_p.h src/location/maps/qgeorouteparserosrmv5.cpp src/location/maps/qgeotiledmap.cpp src/positioning/positioning.pro Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb
| * | | | Remove forcing the qtquickcompiler on the mapviewer example5.10Paolo Angelelli2018-02-021-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or else it prevents QML debugging. Task-number: QTBUG-64827 Change-Id: I7a31b6a575ed7a4f96368b87aaa883fd3ba2b940 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-2628-249/+599
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp tests/plugins/declarativetestplugin/testhelper.h Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
| | * | Clarify operation of QDeclarativeGeoMapItemBase::childMouseEventFilterPaolo Angelelli2018-01-251-3/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I06353153980659bf9370705b2d7f4263d066bdad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+31
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I8b6caa31bf605220ed024c784fa361d0e77dce06
| | | * | Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-111-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If621d6bbfcf4380d8155da0453b97be2e535760e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>