diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 14:29:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 14:29:06 +0200 |
| commit | 1e9eb569c57c08f0eaa79a9afeb57402271f11b1 (patch) | |
| tree | e8e5c5befba04e9d10ec84e8d829076838905ac5 /src/location/maps/qgeocameratiles.cpp | |
| parent | 33d57f8018535dfe4ac316fc0f2ebe69fb5ade1c (diff) | |
| parent | d1c91515ef0ad4208c41a4052f92bfb817333aca (diff) | |
| download | qtlocation-1e9eb569c57c08f0eaa79a9afeb57402271f11b1.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/location/qquickgeomapgesturearea.cpp
Change-Id: If115a052678b140eee46b8c0d9471b7d96953915
Diffstat (limited to 'src/location/maps/qgeocameratiles.cpp')
| -rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp index 58aa1f30..d2783a5b 100644 --- a/src/location/maps/qgeocameratiles.cpp +++ b/src/location/maps/qgeocameratiles.cpp @@ -152,6 +152,7 @@ QSet<QGeoTileSpec> QGeoCameraTiles::prefetchTiles(PrefetchStle style) double neighbourScale = (1.0 + zoomFraction)/2.0; d_ptr->updateGeometry(PREFETCH_FRUSTUM_SCALE * neighbourScale); } + break; } case PrefetchTwoNeighbourLayers: { |