Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtLocation
Commits
c2f6604a
Commit
c2f6604a
authored
7 years ago
by
Paolo Angelelli
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into wip/navigation
Change-Id: If8c2766bc6cd2ef7c424f92212ed8db2a4824d09
parents
2778eb19
6a5215ed
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
No related merge requests found
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
dist/changes-5.10.1
+26
-0
dist/changes-5.10.1
dist/changes-5.9.4
+31
-0
dist/changes-5.9.4
examples/location/mapviewer/mapviewer.pro
+0
-1
examples/location/mapviewer/mapviewer.pro
src/3rdparty/earcut/earcut.hpp
+2
-2
src/3rdparty/earcut/earcut.hpp
src/location/configure.json
+2
-2
src/location/configure.json
src/location/declarativemaps/qdeclarativegeocodemodel.cpp
+6
-5
src/location/declarativemaps/qdeclarativegeocodemodel.cpp
src/location/declarativemaps/qdeclarativegeomap.cpp
+125
-119
src/location/declarativemaps/qdeclarativegeomap.cpp
src/location/declarativemaps/qdeclarativegeomap_p.h
+13
-1
src/location/declarativemaps/qdeclarativegeomap_p.h
src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+51
-20
...on/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
+9
-3
...on/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
src/location/declarativemaps/qdeclarativegeomapitembase.cpp
+8
-3
src/location/declarativemaps/qdeclarativegeomapitembase.cpp
src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+2
-0
src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+1
-1
src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
src/location/doc/src/plugins/places-backend.qdoc
+1
-1
src/location/doc/src/plugins/places-backend.qdoc
src/location/maps/qgeomap.cpp
+28
-1
src/location/maps/qgeomap.cpp
src/location/maps/qgeomap_p.h
+2
-0
src/location/maps/qgeomap_p.h
src/location/maps/qgeomap_p_p.h
+6
-0
src/location/maps/qgeomap_p_p.h
src/location/maps/qgeorouteparserosrmv5.cpp
+1
-1
src/location/maps/qgeorouteparserosrmv5.cpp
src/location/maps/qgeotiledmap.cpp
+14
-2
src/location/maps/qgeotiledmap.cpp
src/location/maps/qgeotiledmap_p.h
+2
-0
src/location/maps/qgeotiledmap_p.h
with
330 additions
and
162 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets