summaryrefslogtreecommitdiff
path: root/src/location/labs/qmapobjectview.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:04:43 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:04:43 +0200
commit70752a28042b68f1f086c80371d31dc968d44dcc (patch)
tree68b743eb57da17dc6b49ccfccfe78f8b2ac34d5d /src/location/labs/qmapobjectview.cpp
parent1c61d6de77657d60814d582153e75ace6597dde7 (diff)
parenta6ac8739a23c4101a3c582aa89281aa90027128f (diff)
downloadqtlocation-70752a28042b68f1f086c80371d31dc968d44dcc.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I1ce07319e35851fc4aec032296290bba2583bcda
Diffstat (limited to 'src/location/labs/qmapobjectview.cpp')
0 files changed, 0 insertions, 0 deletions