Skip to content
GitLab
Commit 677833d4 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.10' into 5.11 

 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
parents 7d46b521 b9d4da55
dev 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 6.2.0 6.2.1 6.2.2 wip/cmake wip/navigation v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 277 additions and 167 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment