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
e2ece6d1
Commit
e2ece6d1
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
parents
f0c46685
78c73ebf
No related merge requests found
Changes
16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
src/imports/location/qdeclarativegeomap.cpp
+3
-0
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/qgeorouteparser_p_p.h
+11
-0
src/location/maps/qgeorouteparser_p_p.h
src/plugins/geoservices/nokia/nokia.pro
+2
-2
src/plugins/geoservices/nokia/nokia.pro
src/plugins/geoservices/nokia/qgeocodejsonparser.cpp
+413
-0
src/plugins/geoservices/nokia/qgeocodejsonparser.cpp
src/plugins/geoservices/nokia/qgeocodejsonparser.h
+10
-23
src/plugins/geoservices/nokia/qgeocodejsonparser.h
src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
+12
-5
src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
src/plugins/geoservices/nokia/qgeocodereply_nokia.h
+2
-1
src/plugins/geoservices/nokia/qgeocodereply_nokia.h
src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+0
-573
src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+131
-63
...ugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+3
-2
...plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+1
-1
...plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
src/plugins/geoservices/nokia/uri_constants.cpp
+2
-3
src/plugins/geoservices/nokia/uri_constants.cpp
src/plugins/geoservices/nokia/uri_constants.h
+1
-2
src/plugins/geoservices/nokia/uri_constants.h
src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
+0
-7
src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+19
-2
src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
sync.profile
+0
-14
sync.profile
with
610 additions
and
698 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