diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-08-27 12:22:14 +0200 |
|---|---|---|
| committer | paolo <paolo.angelelli@qt.io> | 2017-08-27 12:24:05 +0200 |
| commit | 05703dd5271a2b25ee18dda6c136a5bee0f92629 (patch) | |
| tree | 72668686841f3cc1df9384b90863e0eb175f53e6 /config.tests | |
| parent | b68b88373beb884c77ec9813cac1e9a79854b957 (diff) | |
| parent | d22e6d09f1607e694694d2ae5b2f447605a8782e (diff) | |
| download | qtlocation-05703dd5271a2b25ee18dda6c136a5bee0f92629.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
Change-Id: I4940db79ebe500ff7e37ded42c7d29d7ccfb6253
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions