Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97

1 files changed, 4 insertions, 4 deletions

diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index 96b78a53b4..5d84f9dc2b 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -91,7 +91,7 @@ QQuickTargetDirection::QQuickTargetDirection(QObject *parent) :
   , m_proportionalMagnitude(false)
   , m_magnitude(0)
   , m_magnitudeVariation(0)
-  , m_targetItem(0)
+  , m_targetItem(nullptr)
 {
 }
 
@@ -118,10 +118,10 @@ QPointF QQuickTargetDirection::sample(const QPointF &from)
         targetX = m_targetX;
         targetY = m_targetY;
     }
-    targetX += 0 - from.x() - m_targetVariation + QRandomGenerator::getReal() * m_targetVariation*2;
-    targetY += 0 - from.y() - m_targetVariation + QRandomGenerator::getReal() * m_targetVariation*2;
+    targetX += 0 - from.x() - m_targetVariation + QRandomGenerator::global()->generateDouble() * m_targetVariation*2;
+    targetY += 0 - from.y() - m_targetVariation + QRandomGenerator::global()->generateDouble() * m_targetVariation*2;
     qreal theta = std::atan2(targetY, targetX);
-    qreal mag = m_magnitude + QRandomGenerator::getReal() * m_magnitudeVariation * 2 - m_magnitudeVariation;
+    qreal mag = m_magnitude + QRandomGenerator::global()->generateDouble() * m_magnitudeVariation * 2 - m_magnitudeVariation;
     if (m_proportionalMagnitude)
         mag *= std::sqrt(targetX * targetX + targetY * targetY);
     ret.setX(mag * std::cos(theta));