summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 13:12:16 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 18:21:33 +0200
commit181f1de815d2f4b32430f798da255c98dd7859ae (patch)
tree1652d0d5695a0e9d1f3c70e7159eec44c5c09f82 /src/location/declarativemaps/qdeclarativegeomapitembase.cpp
parentaa8bb4d64864e0c3cfb9374a367e783602b75eba (diff)
parentb3352732dceb1d22efda055df9b7c3f7f2237e20 (diff)
downloadqtlocation-181f1de815d2f4b32430f798da255c98dd7859ae.tar.gz
Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomapitembase.cpp')
0 files changed, 0 insertions, 0 deletions