diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:56 +0200 |
| commit | 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7 (patch) | |
| tree | 0ad7002074b2996460d72722435c97d76ddc6466 /src/location/maps | |
| parent | 420139a36dace3bb8f78f2d65b30f7657668d888 (diff) | |
| parent | 5542c721af400750b13bd411dfbb13891f49618e (diff) | |
| download | qtlocation-40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
Diffstat (limited to 'src/location/maps')
| -rw-r--r-- | src/location/maps/qgeoprojection.cpp | 2 | ||||
| -rw-r--r-- | src/location/maps/qgeotiledmapscene.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/location/maps/qgeoprojection.cpp b/src/location/maps/qgeoprojection.cpp index 319bf906..783193ed 100644 --- a/src/location/maps/qgeoprojection.cpp +++ b/src/location/maps/qgeoprojection.cpp @@ -254,7 +254,7 @@ QGeoCoordinate QGeoProjectionWebMercator::wrappedMapProjectionToGeo(const QDoubl return mapProjectionToGeo(unwrapMapProjection(wrappedProjection)); } -QMatrix4x4 QGeoProjectionWebMercator::quickItemTransformation(const QGeoCoordinate &coordinate, const QPointF &anchorPoint, double zoomLevel) const +QMatrix4x4 QGeoProjectionWebMercator::quickItemTransformation(const QGeoCoordinate &coordinate, const QPointF &anchorPoint, qreal zoomLevel) const { const QDoubleVector2D coordWrapped = geoToWrappedMapProjection(coordinate); double scale = std::pow(0.5, zoomLevel - m_cameraData.zoomLevel()); diff --git a/src/location/maps/qgeotiledmapscene.cpp b/src/location/maps/qgeotiledmapscene.cpp index 422082fc..ab15e37b 100644 --- a/src/location/maps/qgeotiledmapscene.cpp +++ b/src/location/maps/qgeotiledmapscene.cpp @@ -609,6 +609,8 @@ void QGeoTiledMapRootNode::updateTiles(QGeoTiledMapTileContainerNode *root, #if QT_CONFIG(opengl) if (ogl) static_cast<QSGDefaultImageNode *>(node)->setAnisotropyLevel(QSGTexture::Anisotropy16x); +#else + Q_UNUSED(ogl) #endif dirtyBits |= QSGNode::DirtyMaterial; } |