summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeocameratiles.cpp
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-06-10 20:38:50 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-06-16 16:08:59 +0200
commita0ed5f9f9c8acf1b4b631b69774ac67ac37739bc (patch)
tree83afaa8ebeb5abd6571b2842f7a68399e652b508 /src/location/maps/qgeocameratiles.cpp
parent5164413d711409c64f153a2049d587580b15fe5e (diff)
downloadqtlocation-a0ed5f9f9c8acf1b4b631b69774ac67ac37739bc.tar.gz
Silence build warnings, fix build errors
Replace various deprecated APIs with their supported Qt 6 versions. Most notably, replace QScopedPointer with std::unique_ptr, as the code frequently use deprecated QScopedPointer::swap. Change-Id: If9cb0be89423fd310073709eb390401d74240153 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/maps/qgeocameratiles.cpp')
-rw-r--r--src/location/maps/qgeocameratiles.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp
index 4fea05c8..1a401b53 100644
--- a/src/location/maps/qgeocameratiles.cpp
+++ b/src/location/maps/qgeocameratiles.cpp
@@ -271,13 +271,13 @@ Frustum QGeoCameraTilesPrivate::createFrustum(double viewExpansion) const
// The rotation direction here is the opposite of QGeoTiledMapScene::setupCamera,
// as this is basically rotating the map against a fixed view frustum.
mBearing.rotate(1.0 * m_camera.bearing(), toVector3D(view));
- up = toDoubleVector3D(mBearing * toVector3D(up));
+ up = toDoubleVector3D(mBearing.map(toVector3D(up)));
// same for tilting
QDoubleVector3D side2 = QDoubleVector3D::normal(up, view);
QMatrix4x4 mTilt;
mTilt.rotate(-1.0 * m_camera.tilt(), toVector3D(side2));
- eye = toDoubleVector3D((mTilt * toVector3D(view)) + toVector3D(center));
+ eye = toDoubleVector3D((mTilt.map(toVector3D(view))) + toVector3D(center));
view = eye - center;
side = QDoubleVector3D::normal(view, QDoubleVector3D(0.0, 1.0, 0.0));