Update to new QRandomGenerator API

To get latest qtbase dev integrated in qt5 dev again without
qtdeclarative 5.10->dev merge.

Change-Id: I6905649aca2b06302df8cee2f660f1f92398d36a
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
(cherry picked from commit ee00fa01dc41deaaedfa0d1d5cc6cd750bfe75f4)
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

13 files changed, 38 insertions, 38 deletions

diff --git a/src/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp
index 11a007ca09..34afd9ce84 100644
--- a/src/particles/qquickangledirection.cpp
+++ b/src/particles/qquickangledirection.cpp
@@ -108,8 +108,8 @@ QPointF QQuickAngleDirection::sample(const QPointF &from)
 {
     Q_UNUSED(from);
     QPointF ret;
-    qreal theta = m_angle*CONV - m_angleVariation*CONV + QRandomGenerator::getReal() * m_angleVariation*CONV * 2;
-    qreal mag = m_magnitude- m_magnitudeVariation + QRandomGenerator::getReal() * m_magnitudeVariation * 2;
+    qreal theta = m_angle*CONV - m_angleVariation*CONV + QRandomGenerator::global()->generateDouble() * m_angleVariation*CONV * 2;
+    qreal mag = m_magnitude- m_magnitudeVariation + QRandomGenerator::global()->generateDouble() * m_magnitudeVariation * 2;
     ret.setX(mag * qCos(theta));
     ret.setY(mag * qSin(theta));
     return ret;
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index a2bcd91167..e344fea1fa 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -425,7 +425,7 @@ void QQuickCustomParticle::buildData(QQuickOpenGLShaderEffectNode *rootNode)
 void QQuickCustomParticle::initialize(int gIdx, int pIdx)
 {
     QQuickParticleData* datum = m_system->groupData[gIdx]->data[pIdx];
-    datum->r = QRandomGenerator::getReal();
+    datum->r = QRandomGenerator::global()->generateDouble();
 }
 
 void QQuickCustomParticle::commit(int gIdx, int pIdx)
diff --git a/src/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp
index fbb11b34cc..52fccd6da9 100644
--- a/src/particles/qquickellipseextruder.cpp
+++ b/src/particles/qquickellipseextruder.cpp
@@ -68,8 +68,8 @@ QQuickEllipseExtruder::QQuickEllipseExtruder(QObject *parent) :
 
 QPointF QQuickEllipseExtruder::extrude(const QRectF & r)
 {
-    qreal theta = QRandomGenerator::bounded(2 * M_PI);
-    qreal mag = m_fill ? QRandomGenerator::getReal() : 1;
+    qreal theta = QRandomGenerator::global()->bounded(2 * M_PI);
+    qreal mag = m_fill ? QRandomGenerator::global()->generateDouble() : 1;
     return QPointF(r.x() + r.width()/2 + mag * (r.width()/2) * qCos(theta),
                    r.y() + r.height()/2 + mag * (r.height()/2) * qSin(theta));
 }
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index 8f809176a9..37bf323f42 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1730,9 +1730,9 @@ void QQuickImageParticle::initialize(int gIdx, int pIdx)
                 if (!datum->rotationOwner)
                     datum->rotationOwner = this;
                 rotation =
-                        (m_rotation + (m_rotationVariation - 2*QRandomGenerator::bounded(m_rotationVariation)) ) * CONV;
+                        (m_rotation + (m_rotationVariation - 2*QRandomGenerator::global()->bounded(m_rotationVariation)) ) * CONV;
                 rotationVelocity =
-                        (m_rotationVelocity + (m_rotationVelocityVariation - 2*QRandomGenerator::bounded(m_rotationVelocityVariation)) ) * CONV;
+                        (m_rotationVelocity + (m_rotationVelocityVariation - 2*QRandomGenerator::global()->bounded(m_rotationVelocityVariation)) ) * CONV;
                 autoRotate = m_autoRotation?1.0:0.0;
                 if (datum->rotationOwner == this) {
                     datum->rotation = rotation;
@@ -1751,10 +1751,10 @@ void QQuickImageParticle::initialize(int gIdx, int pIdx)
             if (m_explicitColor) {
                 if (!datum->colorOwner)
                     datum->colorOwner = this;
-                color.r = m_color.red() * (1 - redVariation) + QRandomGenerator::bounded(256) * redVariation;
-                color.g = m_color.green() * (1 - greenVariation) + QRandomGenerator::bounded(256) * greenVariation;
-                color.b = m_color.blue() * (1 - blueVariation) + QRandomGenerator::bounded(256) * blueVariation;
-                color.a = m_alpha * m_color.alpha() * (1 - m_alphaVariation) + QRandomGenerator::bounded(256) * m_alphaVariation;
+                color.r = m_color.red() * (1 - redVariation) + QRandomGenerator::global()->bounded(256) * redVariation;
+                color.g = m_color.green() * (1 - greenVariation) + QRandomGenerator::global()->bounded(256) * greenVariation;
+                color.b = m_color.blue() * (1 - blueVariation) + QRandomGenerator::global()->bounded(256) * blueVariation;
+                color.a = m_alpha * m_color.alpha() * (1 - m_alphaVariation) + QRandomGenerator::global()->bounded(256) * m_alphaVariation;
                 if (datum->colorOwner == this)
                     datum->color = color;
                 else
diff --git a/src/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp
index 6ebd728407..670e656b8e 100644
--- a/src/particles/qquicklineextruder.cpp
+++ b/src/particles/qquicklineextruder.cpp
@@ -69,10 +69,10 @@ QPointF QQuickLineExtruder::extrude(const QRectF &r)
 {
     qreal x,y;
     if (!r.height()){
-        x = r.width() * QRandomGenerator::getReal();
+        x = r.width() * QRandomGenerator::global()->generateDouble();
         y = 0;
     }else{
-        y = r.height() * QRandomGenerator::getReal();
+        y = r.height() * QRandomGenerator::global()->generateDouble();
         if (!r.width()){
             x = 0;
         }else{
diff --git a/src/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp
index 60c23c55a8..6ab6dcc6a4 100644
--- a/src/particles/qquickmaskextruder.cpp
+++ b/src/particles/qquickmaskextruder.cpp
@@ -103,7 +103,7 @@ QPointF QQuickMaskExtruder::extrude(const QRectF &r)
     ensureInitialized(r);
     if (!m_mask.count() || m_img.isNull())
         return r.topLeft();
-    const QPointF p = m_mask[QRandomGenerator::bounded(m_mask.count())];
+    const QPointF p = m_mask[QRandomGenerator::global()->bounded(m_mask.count())];
     //### Should random sub-pixel positioning be added?
     return p + r.topLeft();
 }
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index d18250d706..d4e6552d95 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -425,7 +425,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
             datum->t = pt;
             datum->lifeSpan =
                     (m_particleDuration
-                     + (QRandomGenerator::bounded((m_particleDurationVariation*2) + 1) - m_particleDurationVariation))
+                     + (QRandomGenerator::global()->bounded((m_particleDurationVariation*2) + 1) - m_particleDurationVariation))
                     / 1000.0;
 
             if (datum->lifeSpan >= m_system->maxLife){
@@ -462,7 +462,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
 
             // Particle size
             float sizeVariation = -m_particleSizeVariation
-                    + QRandomGenerator::bounded(m_particleSizeVariation * 2);
+                    + QRandomGenerator::global()->bounded(m_particleSizeVariation * 2);
 
             float size = qMax((qreal)0.0 , m_particleSize + sizeVariation);
             float endSize = qMax((qreal)0.0 , sizeAtEnd + sizeVariation);
diff --git a/src/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp
index 74b450921f..816ff34960 100644
--- a/src/particles/qquickparticleextruder.cpp
+++ b/src/particles/qquickparticleextruder.cpp
@@ -59,8 +59,8 @@ QQuickParticleExtruder::QQuickParticleExtruder(QObject *parent) :
 
 QPointF QQuickParticleExtruder::extrude(const QRectF &rect)
 {
-    return QPointF(QRandomGenerator::getReal() * rect.width() + rect.x(),
-                   QRandomGenerator::getReal() * rect.height() + rect.y());
+    return QPointF(QRandomGenerator::global()->generateDouble() * rect.width() + rect.x(),
+                   QRandomGenerator::global()->generateDouble() * rect.height() + rect.y());
 }
 
 bool QQuickParticleExtruder::contains(const QRectF &bounds, const QPointF &point)
diff --git a/src/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp
index 7b5c9bada1..f22eea2a76 100644
--- a/src/particles/qquickpointdirection.cpp
+++ b/src/particles/qquickpointdirection.cpp
@@ -78,8 +78,8 @@ QQuickPointDirection::QQuickPointDirection(QObject *parent) :
 QPointF QQuickPointDirection::sample(const QPointF &)
 {
     QPointF ret;
-    ret.setX(m_x - m_xVariation + QRandomGenerator::getReal() * m_xVariation * 2);
-    ret.setY(m_y - m_yVariation + QRandomGenerator::getReal() * m_yVariation * 2);
+    ret.setX(m_x - m_xVariation + QRandomGenerator::global()->generateDouble() * m_xVariation * 2);
+    ret.setY(m_y - m_yVariation + QRandomGenerator::global()->generateDouble() * m_yVariation * 2);
     return ret;
 }
 
diff --git a/src/particles/qquickrectangleextruder.cpp b/src/particles/qquickrectangleextruder.cpp
index 6474f61630..36e4871d29 100644
--- a/src/particles/qquickrectangleextruder.cpp
+++ b/src/particles/qquickrectangleextruder.cpp
@@ -60,21 +60,21 @@ QQuickRectangleExtruder::QQuickRectangleExtruder(QObject *parent) :
 QPointF QQuickRectangleExtruder::extrude(const QRectF &rect)
 {
     if (m_fill)
-        return QPointF(QRandomGenerator::getReal() * rect.width() + rect.x(),
-                       QRandomGenerator::getReal() * rect.height() + rect.y());
-    int side = QRandomGenerator::bounded(4);
+        return QPointF(QRandomGenerator::global()->generateDouble() * rect.width() + rect.x(),
+                       QRandomGenerator::global()->generateDouble() * rect.height() + rect.y());
+    int side = QRandomGenerator::global()->bounded(4);
     switch (side){//TODO: Doesn't this overlap the corners?
     case 0:
         return QPointF(rect.x(),
-                       QRandomGenerator::getReal() * rect.height() + rect.y());
+                       QRandomGenerator::global()->generateDouble() * rect.height() + rect.y());
     case 1:
         return QPointF(rect.width() + rect.x(),
-                       QRandomGenerator::getReal() * rect.height() + rect.y());
+                       QRandomGenerator::global()->generateDouble() * rect.height() + rect.y());
     case 2:
-        return QPointF(QRandomGenerator::getReal() * rect.width() + rect.x(),
+        return QPointF(QRandomGenerator::global()->generateDouble() * rect.width() + rect.x(),
                        rect.y());
     default:
-        return QPointF(QRandomGenerator::getReal() * rect.width() + rect.x(),
+        return QPointF(QRandomGenerator::global()->generateDouble() * rect.width() + rect.x(),
                        rect.height() + rect.y());
     }
 }
diff --git a/src/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp
index 96b78a53b4..a113b7c04a 100644
--- a/src/particles/qquicktargetdirection.cpp
+++ b/src/particles/qquicktargetdirection.cpp
@@ -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));
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 14075f6b23..49ee728bfd 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -208,7 +208,7 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
                 datum->t = pt;
                 datum->lifeSpan =
                         (m_particleDuration
-                         + (QRandomGenerator::bounded((m_particleDurationVariation*2) + 1) - m_particleDurationVariation))
+                         + (QRandomGenerator::global()->bounded((m_particleDurationVariation*2) + 1) - m_particleDurationVariation))
                         / 1000.0;
 
                 // Particle position
@@ -241,7 +241,7 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
 
                 // Particle size
                 float sizeVariation = -m_particleSizeVariation
-                        + QRandomGenerator::getReal() * m_particleSizeVariation * 2;
+                        + QRandomGenerator::global()->generateDouble() * m_particleSizeVariation * 2;
 
                 float size = qMax((qreal)0.0, m_particleSize + sizeVariation);
                 float endSize = qMax((qreal)0.0, sizeAtEnd + sizeVariation);
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp
index cfdede440b..a78482ec84 100644
--- a/src/particles/qquickwander.cpp
+++ b/src/particles/qquickwander.cpp
@@ -103,8 +103,8 @@ WanderData* QQuickWanderAffector::getData(int idx)
     d->y_vel = 0;
     d->x_peak = m_xVariance;
     d->y_peak = m_yVariance;
-    d->x_var = m_pace * QRandomGenerator::getReal();
-    d->y_var = m_pace * QRandomGenerator::getReal();
+    d->x_var = m_pace * QRandomGenerator::global()->generateDouble();
+    d->y_var = m_pace * QRandomGenerator::global()->generateDouble();
 
     m_wanderData.insert(idx, d);
     return d;
@@ -125,7 +125,7 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt)
     if (m_xVariance != 0.) {
         if ((d->x_vel > d->x_peak && d->x_var > 0.0) || (d->x_vel < -d->x_peak && d->x_var < 0.0)) {
             d->x_var = -d->x_var;
-            d->x_peak = m_xVariance + m_xVariance * QRandomGenerator::getReal();
+            d->x_peak = m_xVariance + m_xVariance * QRandomGenerator::global()->generateDouble();
         }
         d->x_vel += d->x_var * dt;
     }
@@ -134,7 +134,7 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt)
     if (m_yVariance != 0.) {
         if ((d->y_vel > d->y_peak && d->y_var > 0.0) || (d->y_vel < -d->y_peak && d->y_var < 0.0)) {
             d->y_var = -d->y_var;
-            d->y_peak = m_yVariance + m_yVariance * QRandomGenerator::getReal();
+            d->y_peak = m_yVariance + m_yVariance * QRandomGenerator::global()->generateDouble();
         }
         d->y_vel += d->y_var * dt;
     }
@@ -147,8 +147,8 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt)
     p->y += dy;
     return true;
     */
-    qreal dx = dt * m_pace * (2 * QRandomGenerator::getReal() - 1);
-    qreal dy = dt * m_pace * (2 * QRandomGenerator::getReal() - 1);
+    qreal dx = dt * m_pace * (2 * QRandomGenerator::global()->generateDouble() - 1);
+    qreal dy = dt * m_pace * (2 * QRandomGenerator::global()->generateDouble() - 1);
     qreal newX, newY;
     switch (m_affectedParameter){
     case Position: