aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Smith <daniel.smith@qt.io>2020-09-29 15:05:17 +0200
committerDaniel Smith <Daniel.Smith@qt.io>2020-09-30 07:37:39 +0000
commit01a08c32dade506bcecb54e29f477d1ac1954bd2 (patch)
treebc4eef6f654fcd85688562d3981131d1fafa8cc5
parente3fcdb3adcaa324c7ab5c97839563c4bb87b4017 (diff)
Adapt to qt6 changes
Use qmlRegisterAnonymousType since qmlRegisterType with 0 params is deprecated. Use QRandomGenerator instead of qrand() Change-Id: Ic25c445fa8a9e08147093ea40f1b87f4067ef8c1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--src/main.cpp3
-rw-r--r--src/qmlbench.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index cb6a196..f641f3d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -393,7 +393,8 @@ int main(int argc, char **argv)
// GL context.
setupDefaultSurfaceFormat(argc, argv);
- qmlRegisterType<QQuickView>();
+
+ qmlRegisterAnonymousType<QQuickView>("QmlBench", 1);
qmlRegisterType(QUrl("qrc:/Benchmark.qml"), "QmlBench", 1, 0, "Benchmark");
qmlRegisterType(QUrl("qrc:/CreationBenchmark.qml"), "QmlBench", 1, 0, "CreationBenchmark");
qmlRegisterType(QUrl("qrc:/V8Benchmark.qml"), "QmlBench", 1, 0, "V8Benchmark");
diff --git a/src/qmlbench.cpp b/src/qmlbench.cpp
index e25b22c..39a6e14 100644
--- a/src/qmlbench.cpp
+++ b/src/qmlbench.cpp
@@ -27,6 +27,7 @@
****************************************************************************/
#include "qmlbench.h"
+#include <QRandomGenerator>
#define PREGENERATED_COUNT 10001
@@ -36,7 +37,7 @@ QmlBench::QmlBench(QObject *parent)
{
m_pregeneratedRandomNumbers = new qreal[PREGENERATED_COUNT];
for (int i = 0; i < PREGENERATED_COUNT; ++i)
- m_pregeneratedRandomNumbers[i] = qrand() / qreal(RAND_MAX);
+ m_pregeneratedRandomNumbers[i] = QRandomGenerator().generateDouble();
}
QmlBench::~QmlBench()