Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp

Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index d13751385c..cb23d6edbd 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -452,7 +452,7 @@ void tst_QJSEngine::installTranslatorFunctions()
 {
     newEngine();
     QBENCHMARK {
-        m_engine->installTranslatorFunctions();
+        m_engine->installExtensions(QJSEngine::TranslationExtension);
     }
 }
 
@@ -471,7 +471,7 @@ void tst_QJSEngine::translation()
     QFETCH(QString, text);
     QFETCH(QString, fileName);
     newEngine();
-    m_engine->installTranslatorFunctions();
+    m_engine->installExtensions(QJSEngine::TranslationExtension);
 
     QBENCHMARK {
         (void)m_engine->evaluate(text, fileName);
diff --git a/tests/benchmarks/qml/painting/paintbenchmark.cpp b/tests/benchmarks/qml/painting/paintbenchmark.cpp
index d195675ab8..1500f39c9a 100644
--- a/tests/benchmarks/qml/painting/paintbenchmark.cpp
+++ b/tests/benchmarks/qml/painting/paintbenchmark.cpp
@@ -34,7 +34,7 @@
 #include <QGLWidget>
 #include <QTextLayout>
 #include <QVBoxLayout>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QDebug>
 #include <QRandomGenerator>
 #include <QStaticText>
@@ -328,20 +328,20 @@ public:
     }
 
     void paintEvent(QPaintEvent *) {
-        static int last = 0;
+        static qint64 last = 0;
         static bool firstRun = true;
         if (firstRun) {
             timer.start();
             firstRun = false;
         } else {
-            int elapsed = timer.elapsed();
+            qint64 elapsed = timer.elapsed();
             qDebug() << "frame elapsed:" << elapsed - last;
             last = elapsed;
         }
         QPainter p(this);
         p.fillRect(rect(), Qt::white);
         p.setPen(Qt::black);
-        QTime drawTimer;
+        QElapsedTimer drawTimer;
         drawTimer.start();
         testFunc(p);
         qDebug() << "draw time" << drawTimer.elapsed();
@@ -351,7 +351,7 @@ public:
             qApp->quit();
     }
 
-    QTime timer;
+    QElapsedTimer timer;
     int frames;
 };