diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-14 12:35:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-14 12:35:57 +0100 |
| commit | 632f5735d055129067d12ea7d6cd33ebd560aa3b (patch) | |
| tree | 78d83bffadb03dec7f19461a40800408c68d4f53 /src/location/declarativemaps/qdeclarativepolygonmapitem.cpp | |
| parent | 68520449fe15682fe8fcd666860f6ae86493ebf5 (diff) | |
| parent | 3995bee767306476993134cb9c42499daf9ed1bc (diff) | |
| download | qtlocation-632f5735d055129067d12ea7d6cd33ebd560aa3b.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
Change-Id: I2428d360c07b55ec5ee61f81c6f97b3d7b20f363
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolygonmapitem.cpp')
0 files changed, 0 insertions, 0 deletions