Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/particles/qsgpointattractor.cpp b/src/declarative/particles/qsgpointattractor.cpp
index 0ee2fa4c27..6f57ecaa36 100644
--- a/src/declarative/particles/qsgpointattractor.cpp
+++ b/src/declarative/particles/qsgpointattractor.cpp
@@ -60,11 +60,11 @@ bool QSGPointAttractorAffector::affectParticle(QSGParticleData *d, qreal dt)
     qreal ds = 0;
     switch(m_proportionalToDistance){
     case Quadratic:
-        ds = (m_strength / qMax(1.,r*r)) * dt;
+        ds = (m_strength / qMax<qreal>(1.,r*r)) * dt;
         break;
     case Linear://also default
     default:
-        ds = (m_strength / qMax(1.,r)) * dt;
+        ds = (m_strength / qMax<qreal>(1.,r)) * dt;
     }
     dx = ds * cos(theta);
     dy = ds * sin(theta);