From 14599af2f27292710e68a6e500aa9f9cf3a30789 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 21 Sep 2017 12:23:48 -0700
Subject: 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>
---
 tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp  | 16 ++++++++--------
 tests/auto/quick/qquicklistview/randomsortmodel.cpp |  4 ++--
 tests/auto/quick/shared/viewtestutil.cpp            |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp b/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp
index 65ac1ef320..f12c3432c2 100644
--- a/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp
+++ b/tests/auto/qml/qqmlchangeset/tst_qqmlchangeset.cpp
@@ -1487,27 +1487,27 @@ void tst_qqmlchangeset::random()
         for (int j = 0; j < combinations; ++j) {
             QQmlChangeSet set;
             for (int k = 0; k < depth; ++k) {
-                switch (-QRandomGenerator::bounded(3)) {
+                switch (-QRandomGenerator::global()->bounded(3)) {
                 case InsertOp: {
-                    int index = QRandomGenerator::bounded(modelCount + 1);
-                    int count = QRandomGenerator::bounded(5) + 1;
+                    int index = QRandomGenerator::global()->bounded(modelCount + 1);
+                    int count = QRandomGenerator::global()->bounded(5) + 1;
                     set.insert(index, count);
                     input.append(Insert(index, count));
                     modelCount += count;
                     break;
                 }
                 case RemoveOp: {
-                    const int index = QRandomGenerator::bounded(modelCount + 1);
-                    const int count = QRandomGenerator::bounded(modelCount - index + 1);
+                    const int index = QRandomGenerator::global()->bounded(modelCount + 1);
+                    const int count = QRandomGenerator::global()->bounded(modelCount - index + 1);
                     set.remove(index, count);
                     input.append(Remove(index, count));
                     modelCount -= count;
                     break;
                 }
                 case MoveOp: {
-                    const int from = QRandomGenerator::bounded(modelCount + 1);
-                    const int count = QRandomGenerator::bounded(modelCount - from + 1);
-                    const int to = QRandomGenerator::bounded(modelCount - count + 1);
+                    const int from = QRandomGenerator::global()->bounded(modelCount + 1);
+                    const int count = QRandomGenerator::global()->bounded(modelCount - from + 1);
+                    const int to = QRandomGenerator::global()->bounded(modelCount - count + 1);
                     const int moveId = moveCount++;
                     set.move(from, to, count, moveId);
                     input.append(Move(from, to, count, moveId));
diff --git a/tests/auto/quick/qquicklistview/randomsortmodel.cpp b/tests/auto/quick/qquicklistview/randomsortmodel.cpp
index 7c4bd5111c..7375fe0dbe 100644
--- a/tests/auto/quick/qquicklistview/randomsortmodel.cpp
+++ b/tests/auto/quick/qquicklistview/randomsortmodel.cpp
@@ -74,14 +74,14 @@ QVariant RandomSortModel::data(const QModelIndex& index, int role) const
 
 void RandomSortModel::randomize()
 {
-    const int row = QRandomGenerator::bounded(mData.count());
+    const int row = QRandomGenerator::global()->bounded(mData.count());
     int random;
     bool exists = false;
     // Make sure we won't end up with two items with the same weight, as that
     // would make unit-testing much harder
     do {
         exists = false;
-        random = QRandomGenerator::bounded(mData.count() * 10);
+        random = QRandomGenerator::global()->bounded(mData.count() * 10);
         QList<QPair<QString, int> >::ConstIterator iter, end;
         for (iter = mData.constBegin(), end = mData.constEnd(); iter != end; ++iter) {
             if ((*iter).second == random) {
diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 32842a9fde..dc813b9d59 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -374,7 +374,7 @@ void QQuickViewTestUtil::StressTestModel::updateModel()
 {
     if (m_rowCount > 10) {
         for (int i = 0; i < 10; ++i) {
-            int rnum = QRandomGenerator::bounded(m_rowCount);
+            int rnum = QRandomGenerator::global()->bounded(m_rowCount);
             beginRemoveRows(QModelIndex(), rnum, rnum);
             m_rowCount--;
             endRemoveRows();
@@ -382,7 +382,7 @@ void QQuickViewTestUtil::StressTestModel::updateModel()
     }
     if (m_rowCount < 20) {
         for (int i = 0; i < 10; ++i) {
-            int rnum = QRandomGenerator::bounded(m_rowCount);
+            int rnum = QRandomGenerator::global()->bounded(m_rowCount);
             beginInsertRows(QModelIndex(), rnum, rnum);
             m_rowCount++;
             endInsertRows();
-- 
cgit v1.2.3