summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativegeomap.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-18 03:01:24 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-18 03:01:24 +0200
commit0a9ef37972aed19ec4451d0a0e24bfacc56bded3 (patch)
tree42059ae7c75f741a8b9ac08334e48da05cf2eb5d /src/location/declarativemaps/qdeclarativegeomap.cpp
parentf0472774b36c862f5fb6822f2d4d63a967d1eaec (diff)
parent571126c3d63f899a67b896886aaec8cf4f0acb1c (diff)
downloadqtlocation-0a9ef37972aed19ec4451d0a0e24bfacc56bded3.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I001477f8534dd8eb565a365143c5799834df56ff
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp')
0 files changed, 0 insertions, 0 deletions