Use QRandomGenerator instead of q?rand

Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 8 insertions, 6 deletions

diff --git a/examples/quick/scenegraph/graph/noisynode.cpp b/examples/quick/scenegraph/graph/noisynode.cpp
index 834151599b..5658702f3a 100644
--- a/examples/quick/scenegraph/graph/noisynode.cpp
+++ b/examples/quick/scenegraph/graph/noisynode.cpp
@@ -40,6 +40,7 @@
 
 #include "noisynode.h"
 
+#include <QtCore/QRandomGenerator>
 #include <QtQuick/QSGSimpleMaterialShader>
 #include <QtQuick/QSGTexture>
 #include <QtQuick/QQuickWindow>
@@ -103,7 +104,7 @@ NoisyNode::NoisyNode(QQuickWindow *window)
     QImage image(NOISE_SIZE, NOISE_SIZE, QImage::Format_RGB32);
     uint *data = (uint *) image.bits();
     for (int i=0; i<NOISE_SIZE * NOISE_SIZE; ++i) {
-        uint g = rand() & 0xff;
+        uint g = QRandomGenerator::bounded(0xff);
         data[i] = 0xff000000 | (g << 16) | (g << 8) | g;
     }
 
diff --git a/examples/quick/scenegraph/sgengine/window.cpp b/examples/quick/scenegraph/sgengine/window.cpp
index a73d9bf755..0e5c738ce5 100644
--- a/examples/quick/scenegraph/sgengine/window.cpp
+++ b/examples/quick/scenegraph/sgengine/window.cpp
@@ -48,6 +48,7 @@
 #include <QScreen>
 #include <QVariantAnimation>
 #include <QOpenGLFunctions>
+#include <QRandomGenerator>
 
 class Item {
 public:
@@ -61,9 +62,9 @@ public:
         transformNode->appendChildNode(textureNode);
         parentNode->appendChildNode(transformNode);
 
-        int duration = qrand() / float(RAND_MAX) * 400 + 800;
-        rotAnimation.setStartValue(qrand() / float(RAND_MAX) * 720 - 180);
-        rotAnimation.setEndValue(qrand() / float(RAND_MAX) * 720 - 180);
+        int duration = QRandomGenerator::getReal() * 400 + 800;
+        rotAnimation.setStartValue(QRandomGenerator::getReal() * 720 - 180);
+        rotAnimation.setEndValue(QRandomGenerator::getReal() * 720 - 180);
         rotAnimation.setDuration(duration);
         rotAnimation.start();
 
@@ -171,8 +172,8 @@ void Window::addItems()
     QSGTexture *textures[] = { m_smileTexture.data(), m_qtTexture.data() };
     for (int i = 0; i < 50; ++i) {
         QSGTexture *tex = textures[i%2];
-        QPointF fromPos(-tex->textureSize().width(), qrand() / float(RAND_MAX) * (height() - tex->textureSize().height()));
-        QPointF toPos(width(), qrand() / float(RAND_MAX) * height() * 1.5 - height() * 0.25);
+        QPointF fromPos(-tex->textureSize().width(), QRandomGenerator::getReal() * (height() - tex->textureSize().height()));
+        QPointF toPos(width(), QRandomGenerator::getReal() * height() * 1.5 - height() * 0.25);
         m_items.append(QSharedPointer<Item>::create(m_sgRootNode.data(), tex, fromPos, toPos));
     }
     update();