Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev

Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84

1 files changed, 2 insertions, 2 deletions

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 64a90bd8d4..c3e13f162f 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1651,9 +1651,9 @@ void QQuickImageParticle::spritesUpdate(qreal time)
                 qreal frame = (time - datum->animT)/(datum->frameDuration / 1000.0);
                 frame = qBound((qreal)0.0, frame, (qreal)((qreal)datum->frameCount - 1.0));//Stop at count-1 frames until we have between anim interpolation
                 if (m_spritesInterpolate)
-                    progress = modf(frame,&frameAt);
+                    progress = std::modf(frame,&frameAt);
                 else
-                    modf(frame,&frameAt);
+                    std::modf(frame,&frameAt);
             } else {
                 datum->frameAt++;
                 if (datum->frameAt >= datum->frameCount){