diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-07-28 13:26:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 13:27:59 +0200 |
| commit | 99309c5fcf0821ed4da69796b1a315cff7f48250 (patch) | |
| tree | 51847546607f3b45c7728d19606db7f5a1a197b9 /src/declarative | |
| parent | 31ebb4bfb0df83805c5d86b6773f11ba1145c7cd (diff) | |
compile when qreal is a float
Change-Id: I1e5c592f1cacb0a3a80e15b53011efb134db29f7
Reviewed-on: http://codereview.qt.nokia.com/2336
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/particles/qsgtargetaffector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgtargetaffector.cpp b/src/declarative/particles/qsgtargetaffector.cpp index e7bbebe6db..d84bd4dada 100644 --- a/src/declarative/particles/qsgtargetaffector.cpp +++ b/src/declarative/particles/qsgtargetaffector.cpp @@ -76,7 +76,7 @@ bool QSGTargetAffector::affectParticle(QSGParticleData *d, qreal dt) qreal vY = (target.y() - d->y) / tt; qreal w = 1 - (t / tt) + 0.05; - w = qMin(w, 1.0); + w = qMin<qreal>(w, 1.0); qreal wvX = vX * w + d->vx * (1 - w); qreal wvY = vY * w + d->vy * (1 - w); //Screws with the acceleration so that the given start pos with the chosen weighted velocity will still end at the target coordinates |