diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-12 15:28:13 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 04:47:59 +0000 |
| commit | 2b7b24a0e039a18db8ab23475fbab44718f758a2 (patch) | |
| tree | 0cfb916871a7e48d843dcd371d723a7d6083f2a6 /tests/benchmarks/qml | |
| parent | 46ed14da325c6c0382c0bc54cacc347d2d7f2b0a (diff) | |
Use QRandomGenerator instead of q?rand
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/benchmarks/qml')
| -rw-r--r-- | tests/benchmarks/qml/holistic/testtypes.h | 5 | ||||
| -rw-r--r-- | tests/benchmarks/qml/painting/paintbenchmark.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/benchmarks/qml/holistic/testtypes.h b/tests/benchmarks/qml/holistic/testtypes.h index a752a8585b..29ebe97f39 100644 --- a/tests/benchmarks/qml/holistic/testtypes.h +++ b/tests/benchmarks/qml/holistic/testtypes.h @@ -34,6 +34,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qsize.h> #include <QtQml/qqmllist.h> +#include <QtCore/qrandom.h> #include <QtCore/qrect.h> #include <QtGui/qmatrix.h> #include <QtGui/qcolor.h> @@ -223,7 +224,7 @@ public: { QPixmap pv(150, 150); pv.fill(Qt::green); - int choice = qrand() % 4; + int choice = QRandomGenerator::bounded(4); switch (choice) { case 0: setArbitraryVariant(QVariant(QString(QLatin1String("string variant value")))); break; case 1: setArbitraryVariant(QVariant(QColor(110, 120, 130))); break; @@ -253,7 +254,7 @@ public: QVariant retn; QPixmap pv(randomFactorOne % 300, randomFactorTwo % 300); pv.fill(QColor(randomFactorOne % 256, randomFactorTwo % 256, randomFactorThree % 256)); - int choice = qrand() % 4; + int choice = QRandomGenerator::bounded(4); switch (choice) { case 0: retn = QVariant(QString(QLatin1String("string variant value"))); break; case 1: retn = QVariant(QColor(randomFactorThree % 256, randomFactorTwo % 256, randomFactorOne % 256)); break; diff --git a/tests/benchmarks/qml/painting/paintbenchmark.cpp b/tests/benchmarks/qml/painting/paintbenchmark.cpp index 0a9dee4664..98d8d7c16a 100644 --- a/tests/benchmarks/qml/painting/paintbenchmark.cpp +++ b/tests/benchmarks/qml/painting/paintbenchmark.cpp @@ -36,6 +36,7 @@ #include <QVBoxLayout> #include <QTime> #include <QDebug> +#include <QRandomGenerator> #include <QStaticText> int iterations = 20; @@ -321,7 +322,7 @@ public: int len = strlen(chars); for (int i = 0; i < lines; ++i) { for (int j = 0; j < 60; j++) { - strings[i] += QChar(chars[rand() % len]); + strings[i] += QChar(chars[QRandomGenerator::bounded(len)]); } } } |