summaryrefslogtreecommitdiff
path: root/src/location/labs/qmapobjectview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix changed import for delegate modelPaolo Angelelli2019-05-061-1/+1
| | | | | | | | | | | This is needed after 2b91e2bca3 in qtdeclarative. Need to be adjusted to QtQmlModels/private/qqmldelegatemodel_p.h later. Task-number: QTBUG-75607 Change-Id: Ic6db50798edc47f6bca307be3acd1611282d2e83 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Introduce QGeoMapObject::geoShape propertyPaolo Angelelli2019-02-011-0/+19
| | | | | | | | | | In this way MapObjects become a little closer to MapItems, and this property can be used to, for example, center the map on one specific object or object group. Fixes: QTBUG-69640 Change-Id: I4dbead9e670bf5d1eeaccb2bd09d956b8de7da87 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-221-9/+19
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8d0881209c8b0a0dce4ed949ef89ee2679448420
| * Fix MapObjectView removing wrong indices on model changesPaolo Angelelli2019-01-141-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | No incubation cancellation required when an object is removed: the DM takes care of that. Handle also the case of itemCreated called during synchronous object creation, that fires the callback in the middle of the ->object call. Task-number: QTBUG-71264 Change-Id: I058a101c754f22f4b6fbcbd7f6f7ded36f3c129b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix MapObjectView clone and equalsPaolo Angelelli2018-12-111-11/+48
|/ | | | | | | | | This also allow to properly subclass MapObjectViewPrivate, as the model would be passed to the private implementation (and the delegate too). Change-Id: I0513a81120e8e8404fb35eb58fb2532487663ed9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapObjectView object removalPaolo Angelelli2018-05-221-1/+3
| | | | | | | Call delegateModel.cancel if the object is still incubating Change-Id: Iee4af5530b6a00981280b9531cc3c1643db71d03 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Fix QGeoMapObject handling in reference implementationPaolo Angelelli2018-04-221-31/+31
| | | | | | | | | | | | | | | | | setVisible was neither changing the visibility nor triggering repaint. Pimpls weren't removing themselves in their destructors when dynamically added/removed via QGeoMapObjectView add/removeMapObject. This patch also factors out the duplicated QGeoMapObject support from QGeoTiledMapLabs and QGeoMapObjectsOverlay and moves it into an own class, QGeoMapObjectQSGSupport. To properly flush the scene graph nodes upon object removal, a pointer to the QSGNode is added to the MapObject struct, now moved inside QGeoMapObjectQSGSupport. Change-Id: Ie8c6d54f8f340ba3867717d9620791d3fe8021cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Add documentation for QMapObjectViewPaolo Angelelli2018-04-161-2/+32
| | | | | Change-Id: I6cc147892b1fe2fce18df52335b0ffeaa56e2c6f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Move locationlabs code into locationPaolo Angelelli2018-03-231-0/+355
The labs feature will still be controlled by location-labs-plugin config option. They will simply come from the QtLocation module, and be exposed to QML via the additional qml plugin in imports/locationlabs. Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status