diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-08-27 19:53:50 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 05:09:43 +0200 |
| commit | dac48f0417f818ef4e1ef8ba81be64def5154067 (patch) | |
| tree | daa1acd7c67b7d4c3716f53b49939f12db6ca431 /src/location/maps/qgeomapscene.cpp | |
| parent | 64a5278704db4103018c73901c2f949c9df3afac (diff) | |
| download | qtlocation-dac48f0417f818ef4e1ef8ba81be64def5154067.tar.gz | |
Fix compilation on QNX
including <cmath> declares the standard maths functions in the std
namespace not the global namespace.
Change-Id: I293cba5ed166b4f122bb34bca5c1d508e2dda259
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomapscene.cpp')
| -rw-r--r-- | src/location/maps/qgeomapscene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/qgeomapscene.cpp b/src/location/maps/qgeomapscene.cpp index bd56df09..0c3772c4 100644 --- a/src/location/maps/qgeomapscene.cpp +++ b/src/location/maps/qgeomapscene.cpp @@ -174,7 +174,7 @@ void QGeoMapScene::setCameraData(const QGeoCameraData &cameraData) { Q_D(QGeoMapScene); d->cameraData_ = cameraData; - d->intZoomLevel_ = static_cast<int>(floor(d->cameraData_.zoomLevel())); + d->intZoomLevel_ = static_cast<int>(std::floor(d->cameraData_.zoomLevel())); float delta = cameraData.zoomLevel() - d->intZoomLevel_; if (qAbs(delta) < 0.05) { d->linearScaling_ = false; @@ -619,7 +619,7 @@ void QGeoMapScenePrivate::setupCamera() double f = 1.0 * qMin(screenSize_.width(), screenSize_.height()); // fraction of zoom level - double z = pow(2.0, cameraData_.zoomLevel() - intZoomLevel_); + double z = std::pow(2.0, cameraData_.zoomLevel() - intZoomLevel_); // calculate altitdue that allows the visible map tiles // to fit in the screen correctly (note that a larger f will cause |