| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/5.10' into 5.11 | Liang Qi | 2018-02-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | 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 | ||||
| * | Move QtPositioning QML wrappers into declarativepositioning module | Paolo Angelelli | 2017-12-15 | 7 | -0/+1704 |
| In this way it will be possible to use these types in additional QML plugins/components Change-Id: Ie82e37877198b99a98ff4a2b076f39f6a9e4fe32 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> | |||||
 |
index : delta/qt5/qtlocation.git | |
| code.qt.io: qt/qtlocation.git |
| summaryrefslogtreecommitdiff |