diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:02:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:18:14 +0100 |
| commit | 518633da419d6cfaf603773b9e8c5840e783bc4a (patch) | |
| tree | 326ffd3f5497be64e38fa420af016867ada00538 /src/3rdparty/mapbox-gl-native | |
| parent | 9283a290040fd55f7eb34580b99f771d4facdeb4 (diff) | |
| parent | 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c (diff) | |
| download | qtlocation-518633da419d6cfaf603773b9e8c5840e783bc4a.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
tests/plugins/declarativetestplugin/testhelper.h
Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
Diffstat (limited to 'src/3rdparty/mapbox-gl-native')
| m--------- | src/3rdparty/mapbox-gl-native | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject 8c1be4ec01ef46bf453856531ebf53b48ce3dbe +Subproject 572822c8ca15be190b43afbf7f91d132e988bf2 |