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
d0dc1ae4
Commit
d0dc1ae4
authored
8 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I5bcca8956007506362c5a96ff345e28718da584c
parents
d999495a
5d048160
dev
5.10
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
5.8
5.9
5.9.8
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
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
No related merge requests found
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
dist/changes-5.6.2
+55
-0
dist/changes-5.6.2
examples/location/mapviewer/main.cpp
+2
-0
examples/location/mapviewer/main.cpp
examples/location/mapviewer/map/MapComponent.qml
+2
-1
examples/location/mapviewer/map/MapComponent.qml
src/imports/location/qdeclarativegeomap.cpp
+3
-2
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qquickgeomapgesturearea_p.h
+1
-1
src/imports/location/qquickgeomapgesturearea_p.h
src/location/doc/src/plugins/osm.qdoc
+3
-1
src/location/doc/src/plugins/osm.qdoc
src/plugins/geoservices/osm/qgeocodereplyosm.cpp
+31
-26
src/plugins/geoservices/osm/qgeocodereplyosm.cpp
src/positioning/qgeosatelliteinfosource.cpp
+0
-3
src/positioning/qgeosatelliteinfosource.cpp
tests/auto/bic/data/QtPositioning.5.6.0.linux-gcc-amd64.txt
+4118
-0
tests/auto/bic/data/QtPositioning.5.6.0.linux-gcc-amd64.txt
tests/auto/bic/data/QtPositioning.5.7.0.linux-gcc-amd64.txt
+4400
-0
tests/auto/bic/data/QtPositioning.5.7.0.linux-gcc-amd64.txt
with
8615 additions
and
34 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