summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add override to MapPolygonNode/MapPolylineNode::isSubtreeBlockedPaolo Angelelli2018-02-142-2/+2
| | | | | Change-Id: I30ffbe559af8cf911a3525b578a875b5dab69c51 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add begin/end namespace to qmapobjectview_p/_p_p.hPaolo Angelelli2018-02-132-6/+14
| | | | | | | Also fix the include guards Change-Id: I5ae5125d64fd059b9ab62e7671972c1e00758bba Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Change m_map into a QPointerPaolo Angelelli2018-02-121-1/+1
| | | | | | | | Or else it may become a dangling pointer when Plugin {} gets destroyed before Map {} Change-Id: I30d4e1887502d0288d56a4208b338b59116009e6 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Use qAsConst to iterate m_mapParametersPaolo Angelelli2018-02-121-1/+1
| | | | | Change-Id: I7fb4e263d49b12adf260c71ca99ed8476125b3a6 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Make QGeoMap::createMapObjectImplementation virtualPaolo Angelelli2018-02-121-1/+1
| | | | | | | | Needed, for example, to emit an sgNodeChanged or similar upon addition of a new map object, *after* the pimpl has been properly injected. Change-Id: I1442e54aad94c465b0b7b17f1ed92f4900ca1d29 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Update location qmltypesBogDan Vatra2018-02-121-3/+45
| | | | | Change-Id: I376c28b3bcc1116c87481020a0ee2aaa0476f950 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add qmltypes for locationlabsBogDan Vatra2018-02-121-0/+77
| | | | | | Task-number: QTBUG-66263 Change-Id: I62d9c99ce80c8968057ee0488dac413c312c1b20 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Initialize navigationManager and navigationErrorBogDan Vatra2018-02-082-2/+6
| | | | | | | delete navigationManager when is not needed anymore Change-Id: I2bff91ef13369a32e86fba375f7f158b95cf520d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix double deletion in QMapRouteObject::setMapPaolo Angelelli2018-02-081-2/+1
| | | | | Change-Id: I615cc136fc8542f731bc305028aff6dd15fa2c6c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Preemptively release pendingMapObjects upon Map destructionPaolo Angelelli2018-02-081-0/+3
| | | | | | | | In this way QGeoMap::mapObjects doesn't have to return all map objects, as the user added ones should be covered by m_pendingMapObjects. Change-Id: I5c850f2fb820629e0c4dd941d13f04cb3684b898 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Introduce MapObjectViewPaolo Angelelli2018-02-084-2/+546
| | | | | | | | | | | | | | | | This also adds addMapObject/removeMapObject to MapObjectView With this patch, MapObjectView becomes the intended way to programmatically populate a map with map objects. Objects can still be declared inside a Map{} element, but to programmatically add them it is necessary to add them to a MapObjectView that is added to the map. MapObjectView has then 3 ways to populate the map: via nested map objects, via a model, and via programmatically added map objects. All these 3 ways can be used simultaneously. Change-Id: Ic7712355fa5e5787a0b83d9547693e288cba1960 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Introduce MapRouteObjectPaolo Angelelli2018-02-074-4/+334
| | | | | Change-Id: I3680550ae22ef4b143f2e545f672905737a41df2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Set QGeoMapObjectPrivate::m_visible to true by defaultPaolo Angelelli2018-02-071-1/+1
| | | | | Change-Id: I64ff6c1da227ff4da75944612badc646c5cba3c4 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Let QGeoMap::createMapObjectImplementation set the implementationPaolo Angelelli2018-02-074-7/+13
| | | | | | | | | This prevents a sort of "call super" antipattern, where each specific createMapObjectImplementation have to call the setImplementation internally. Change-Id: I0babe89a3a01728e95209cf832f4debc3d8af158 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix crash in QGeoMapObject::setMapPaolo Angelelli2018-02-071-3/+1
| | | | | | | Avoid to delete an already deleted object. Change-Id: Ic8a5404c7ffc2ddc5d109cca2eb60e62923e4422 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into wip/navigationPaolo Angelelli2018-02-0687-299/+301
|\ | | | | | | Change-Id: Iff9103a681e8891f4fbc6e5a5f8418061507e600
| * Fix import namingBogDan Vatra2018-02-061-0/+1
| | | | | | | | | | | | | | | | If we don't set CXX_MODULE, qmake will add "declarative_" prefix to target name which will cause problems when we import the module. Change-Id: Idae0970be944d8a218a4b720625a9ac596b6660c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Replace Q_NULLPTR with nullptrKevin Funk2018-02-0535-49/+49
| | | | | | | | | | Change-Id: Icbebfaae93cc5827d80ef09323ec82868789838a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-0550-246/+246
| | | | | | | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Fix warningBogDan Vatra2018-02-051-0/+1
| | | | | | | | | | Change-Id: I2770b88d52f802ae97e74c7016246bf835ea087e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Rename configure option labs_plugin into locationlabs_pluginPaolo Angelelli2018-01-292-4/+4
| | | | | | | | | | | | | | This to avoid potential clashes, as "labs_plugin" is too generic. Change-Id: I5a797c8f15cd71b9b423fbe8ddfc8733fa0b2854 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Merge remote-tracking branch 'origin/wip/navigation' into devPaolo Angelelli2018-01-2983-758/+3844
| |\ | |/ |/| | | Change-Id: Idd898b13c896d0f19af0926ab4572c10948a2264
* | Revert changing access rights to d_ptr in QGeoRoute/SegmentPaolo Angelelli2018-01-274-0/+21
| | | | | | | | | | | | | | | | As some compilers may put these information in the signature, changing this may break the ABI. Change-Id: I80cce605c735680e6969e84feac57f58b4aa5af4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Introduce Qt.location.labsPaolo Angelelli2018-01-2712-4/+144
| | | | | | | | | | | | | | | | | | | | | | Introducing the new labs qml plugin, Qt.labs.location, and associated qt module. The intended use is to introduce and validate new QML API before they can be moved into QtLocation. Change-Id: If70d1dcedaf708be96e918dc5e25578df93db370 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Allow plugins to use alternative map projectionsPaolo Angelelli2018-01-2718-235/+515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtLocation mapping has always been geared around the WebMercator projection. Some mapping SDKs support additional projections, such as General Perspective (often called globe view or globe rendering). The goal of this patch is to allow a plugin to provide such a view, disabling WebMercator specific features, and redirecting API calls to plugin-specific implementations. In particular, this patch disables the rendering of Map Items (QDeclarativeGeoMapItemBase and sons) for projections different from WebMercator, with the exception of MapQuickItems. MapQuickItems, in turn, lose the ability to draw "on the map", when the projection is different from WebMercator. However, they can still be used to add geolocated popups, buttons and other UI elements. fitViewportToMapItems is also disabled, for both it can't be computed and there wouldn't be any item to fit (with the exception of mapquickitems) Change-Id: I9fa2fdd01a35a078fc4663efc9d269c4ecaa3f41 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Make QPlace extensiblePaolo Angelelli2018-01-2711-198/+429
| | | | | | | | | | | | | | | | This change makes it possible to subclass QPlace with custom private implementations. Change-Id: I363c0e8b7db41d9a8400ce6dbddf5405c619eeef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Introduce QGeoMapObjectPaolo Angelelli2018-01-259-8/+626
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGeoMapObject is a new class of map item, not deriving anymore from QQuickItem, and designed to be more lightweight, and, most importantly, to be easily backable by SDK-specific implementations, so to act as an as thin as possible wrapper around those. QGeoMapObject is intended to be the base class for this type of items. This patch provides no mean to dynamically add/remove GeoMapObjects. The intended way to do it is by using a MapObjectView, coming initially with the Qt.labs.location extra plugin. Change-Id: I8d6a45a4a32059c7ec4d904f75352e176bffda1e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add sync.profile and configure.json to .pro filesPaolo Angelelli2018-01-243-2/+4
| | | | | | | | | | | | | | | | | | So that they show up in creator and can be inspected/modified easily. Change-Id: Ice26038fd9542496ea98221d6a8b0b05620507dd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Export locationvaluehelper functionsPaolo Angelelli2018-01-241-6/+7
| | | | | | | | | | | | | | So they can be used also in the locationlabs module Change-Id: I57e1fba503af1250134f1fdbd922de81c72ffcd9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add QDeclarativeGeoRoute::route getterPaolo Angelelli2018-01-242-0/+6
| | | | | | | | | | | | | | | | To allow private classes to access the embedded QGeoRoute without the need to be friend. Change-Id: I7184e1a9fd038af3b82d71671667cd5b2e3449a7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add QNavigationManager/QNavigationManagerEnginePaolo Angelelli2018-01-2412-7/+581
| | | | | | | | | | | | | | | | | | | | This patch introduces the abovementioned classes to be subclassed in plugins. These are currently private, and intended to be only used in QML through appropriate wrappers. Change-Id: I4a063031a983e4bd070f503e1458b62e44c6e340 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Allow to extract pimpl from QGeoRoutePaolo Angelelli2018-01-243-0/+8
| | | | | | | | | | | | | | | | | | | | Needed to properly implement Navigators, which only get QGeoRoutes, and may find easier to directly access the private implementation rather than going through the routeId. Change-Id: I6c23d7b5336d1fb99fad3cf588cbf78437e0563f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Extend QParameterizableObject to accept any QObject as quick childPaolo Angelelli2018-01-242-29/+46
| | | | | | | | | | | | | | | | | | | | In this way, not only map parameters can be nested, but also QGeoMapObjects themselves, allowing to avoid one long standing limitation present in map items, where nested items have never been supported. Change-Id: I90ec7a6aeb1d91a38182258b422b8c60bcc9616e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Add static QGeoMapPrivate *QGeoMapPrivate::getPaolo Angelelli2018-01-232-0/+8
| | | | | | | | | | | | | | | | | | The intended use is inside map object implementations, where the objects have only a pointer to QGeoMap, but may need to access the SDK specific data. Change-Id: If37fc7d77a8670e03e78053ee747f2b64c2b9deb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Move QML/Cpp list conversions into locationvaluetypehelperPaolo Angelelli2018-01-224-57/+47
| | | | | | | | | | Change-Id: Iee7f48f7d24b40a2824775654030397617c40640 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix property name in tst_place.qmlPaolo Angelelli2018-01-221-1/+1
| | | | | | | | | | Change-Id: I8d0209d3bed93a60692210f985ce65d58ce5d6ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/navigationPaolo Angelelli2018-01-2212-936/+130
|\ \ | |/ | | | | Change-Id: If60e71a36d0b0034463a88b928e364049270035e
| * Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-166-863/+24
| |\ | | | | | | | | | Change-Id: I028bef0aa6c51fcf7c10115198f4a7fe8fe89a44
| | * Fix license headersLiang Qi2018-01-155-862/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove usage of outdated header.LGPL21 and replace those with proper one (header.LGPL in src, header.GPL-EXCEPT in tests) Remove also unnecessary license files Change-Id: Idccf5af2251ab56b4b4e2279be8ea060fcd4bbac Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Remove duplicated qlocationglobal_p.h entryAlex Blasche2018-01-091-1/+0
| | | | | | | | | | | | | | | | | | | | | It is a private header. Change-Id: Id1455758a64943f7df36030243be8b197b07d450 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Sort OSM parameters in documentationPaolo Angelelli2018-01-111-73/+80
| | | | | | | | | | | | | | | | | | | | | Also document osm.places.page_size and osm.places.debug_query Change-Id: I711c4e45cde660d884134ddb46eff724810df721 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix OSRMv5 support to Waypoints bearingPaolo Angelelli2018-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | OSRM API require one bearing per waypoint, or none at all. Change-Id: If83552a231b7f434a4944e02cdcfcbf552bca31f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | OSM Places: support query limit parameterPaolo Angelelli2018-01-112-0/+7
| | | | | | | | | | | | | | | Change-Id: I9d5b5b547c5932270e0c1f68a21253b01e1d52cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Add debug parameter to OSM plugin to include the request url in resultsPaolo Angelelli2018-01-104-0/+17
| | | | | | | | | | | | | | | Change-Id: Ib2c0ba380ed6f5eecc7eb6bec75037a4922a567f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/navigationPaolo Angelelli2018-01-11396-976/+12279
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/maps/qgeomaneuver.cpp src/location/maps/qgeomaneuver.h src/location/maps/qgeomaneuver_p.h tests/auto/declarative_core/tst_routing.qml Change-Id: Iedf10d678a9129797f9aae872e09f78ef0a32de1
| * | Revert "Blacklist declarative_core::Place::test_emptyPlace() and ↵Liang Qi2018-01-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_saveload()" This reverts commit 8796a64476bcaa1bac944cb1fefcbcba1a0012d6. It got fixed after qtdeclarative updated. Task-number: QTBUG-64986 Change-Id: I32bd006d1bfb0fa21c089ab877ce7bb162c928fb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Use QGeoShapes properly throughout the modulePaolo Angelelli2018-01-096-36/+24
| | | | | | | | | | | | | | | | | | | | | | | | Adds proper support to other valid shapes and use ::boundingGeoRectangle where appropriate. Change-Id: Ibba4cb18f5cca08df62d15b76fa0e1f249dc6fbb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix Waypoint revisionPaolo Angelelli2018-01-092-2/+2
| | | | | | | | | | | | | | | Change-Id: I50c83fa2fee637d04ec6742515311a202c2a4006 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.10' into devPaolo Angelelli2018-01-0714-25/+4954
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/location/location.cpp src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515
| | * Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: Id26e54719ca5b7234bda37f2901edd806b989ce6
View Lorry Controller Status