2 files changed, 25 insertions, 17 deletions

diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
index 80bad7977b..262dca7d52 100644
--- a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
@@ -237,11 +237,12 @@ void tst_qmetaobject::unconnected()
 {
     LotsOfSignals *obj = new LotsOfSignals;
     QFETCH(int, signal_index);
-    QVERIFY(obj->metaObject()->methodCount() == 73);
+    // 74: 70 signals in LotsOfSignals, 2 signals, 1 slot + 1 invokable in QObject
+    QCOMPARE(obj->metaObject()->methodCount(), 74);
     void *v;
     QBENCHMARK {
-        //+1 because QObject has one slot
-        QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, signal_index+1, &v);
+        // Add two because QObject has one slot and one invokable
+        QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, signal_index + 2, &v);
     }
     delete obj;
 }
diff --git a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index 7d6c1ef86d..7b50b3e51a 100644
--- a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -28,6 +28,7 @@
 
 #include <qtest.h>
 #include <QtCore/qmetatype.h>
+#include <QScopeGuard>
 
 class tst_QGuiMetaType : public QObject
 {
@@ -59,17 +60,20 @@ void tst_QGuiMetaType::constructInPlace_data()
 void tst_QGuiMetaType::constructInPlace()
 {
     QFETCH(int, typeId);
-    int size = QMetaType::sizeOf(typeId);
+    QMetaType type(typeId);
+    int size = type.sizeOf();
     void *storage = qMallocAligned(size, 2 * sizeof(qlonglong));
-    QCOMPARE(QMetaType::construct(typeId, storage, /*copy=*/0), storage);
-    QMetaType::destruct(typeId, storage);
+    auto cleanUp = qScopeGuard([&]() {
+        qFreeAligned(storage);
+    });
+    QCOMPARE(type.construct(storage, /*copy=*/0), storage);
+    type.destruct(storage);
     QBENCHMARK {
         for (int i = 0; i < 100000; ++i) {
-            QMetaType::construct(typeId, storage, /*copy=*/0);
-            QMetaType::destruct(typeId, storage);
+            type.construct(storage, /*copy=*/0);
+            type.destruct(storage);
         }
     }
-    qFreeAligned(storage);
 }
 
 void tst_QGuiMetaType::constructInPlaceCopy_data()
@@ -80,19 +84,22 @@ void tst_QGuiMetaType::constructInPlaceCopy_data()
 void tst_QGuiMetaType::constructInPlaceCopy()
 {
     QFETCH(int, typeId);
-    int size = QMetaType::sizeOf(typeId);
+    QMetaType type(typeId);
+    int size = type.sizeOf();
     void *storage = qMallocAligned(size, 2 * sizeof(qlonglong));
-    void *other = QMetaType::create(typeId);
-    QCOMPARE(QMetaType::construct(typeId, storage, other), storage);
-    QMetaType::destruct(typeId, storage);
+    void *other = type.create();
+    auto cleanUp = qScopeGuard([&]() {
+        type.destroy(other);
+        qFreeAligned(storage);
+    });
+    QCOMPARE(type.construct(storage, other), storage);
+    type.destruct(storage);
     QBENCHMARK {
         for (int i = 0; i < 100000; ++i) {
-            QMetaType::construct(typeId, storage, other);
-            QMetaType::destruct(typeId, storage);
+            type.construct(storage, other);
+            type.destruct(storage);
         }
     }
-    QMetaType::destroy(typeId, other);
-    qFreeAligned(storage);
 }
 
 QTEST_MAIN(tst_QGuiMetaType)