2 files changed, 56 insertions, 14 deletions

diff --git a/tests/benchmarks/corelib/kernel/kernel.pro b/tests/benchmarks/corelib/kernel/kernel.pro
index 02eeeaa254..92f7174419 100644
--- a/tests/benchmarks/corelib/kernel/kernel.pro
+++ b/tests/benchmarks/corelib/kernel/kernel.pro
@@ -5,7 +5,8 @@ SUBDIRS = \
         qmetatype \
         qobject \
         qvariant \
-        qcoreapplication
+        qcoreapplication \
+        qtimer_vs_qmetaobject
 
 !qtHaveModule(widgets): SUBDIRS -= \
     qmetaobject \
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
index 66a29780f0..07976aa056 100644
--- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/tst_qtimer_vs_qmetaobject.cpp
@@ -35,8 +35,8 @@ class qtimer_vs_qmetaobject : public QObject
 {
     Q_OBJECT
 private slots:
-    void testZeroTimerSingleShot();
-    void testQueuedInvokeMethod();
+    void bench();
+    void bench_data();
 };
 
 class InvokeCounter : public QObject {
@@ -53,28 +53,69 @@ protected:
     int count;
 };
 
-void qtimer_vs_qmetaobject::testZeroTimerSingleShot()
+void qtimer_vs_qmetaobject::bench()
 {
+    QFETCH(int, type);
+
+    std::function<void(InvokeCounter*)> invoke;
+    if (type == 0) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, SLOT(invokeSlot()));
+        };
+    } else if (type == 1) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, &InvokeCounter::invokeSlot);
+        };
+    } else if (type == 2) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, invokeCounter, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            });
+        };
+    } else if (type == 3) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QTimer::singleShot(0, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            });
+        };
+    } else if (type == 4) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, "invokeSlot", Qt::QueuedConnection);
+        };
+    } else if (type == 5) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, &InvokeCounter::invokeSlot, Qt::QueuedConnection);
+        };
+    } else if (type == 6) {
+        invoke = [](InvokeCounter* invokeCounter) {
+            QMetaObject::invokeMethod(invokeCounter, [invokeCounter]() {
+                invokeCounter->invokeSlot();
+            }, Qt::QueuedConnection);
+        };
+    } else {
+        QFAIL("unhandled data tag");
+    }
+
     QBENCHMARK {
         InvokeCounter invokeCounter;
         for(int i = 0; i < INVOKE_COUNT; ++i) {
-            QTimer::singleShot(0, &invokeCounter, SLOT(invokeSlot()));
+            invoke(&invokeCounter);
         }
         QTestEventLoop::instance().enterLoop(10);
         QVERIFY(!QTestEventLoop::instance().timeout());
     }
 }
 
-void qtimer_vs_qmetaobject::testQueuedInvokeMethod()
+void qtimer_vs_qmetaobject::bench_data()
 {
-    QBENCHMARK {
-        InvokeCounter invokeCounter;
-        for(int i = 0; i < INVOKE_COUNT; ++i) {
-            QMetaObject::invokeMethod(&invokeCounter, "invokeSlot", Qt::QueuedConnection);
-        }
-        QTestEventLoop::instance().enterLoop(10);
-        QVERIFY(!QTestEventLoop::instance().timeout());
-    }
+    QTest::addColumn<int>("type");
+    QTest::addRow("singleShot_slot") << 0;
+    QTest::addRow("singleShot_pmf") << 1;
+    QTest::addRow("singleShot_functor") << 2;
+    QTest::addRow("singleShot_functor_noctx") << 3;
+    QTest::addRow("invokeMethod_string") << 4;
+    QTest::addRow("invokeMethod_pmf") << 5;
+    QTest::addRow("invokeMethod_functor") << 6;
 }