2 files changed, 15 insertions, 20 deletions
diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
index ce834905b0..fb13e8a59e 100644
--- a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
+++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
@@ -1,18 +1,13 @@
-# Generated from qobject.pro.
-
 #####################################################################
 ## tst_bench_qobject Binary:
 #####################################################################
 
 qt_internal_add_benchmark(tst_bench_qobject
     SOURCES
-        main.cpp
+        tst_bench_qobject.cpp
         object.cpp object.h
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Test
         Qt::Widgets
 )
-
-#### Keys ignored in scope 1:.:.:qobject.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qobject/main.cpp b/tests/benchmarks/corelib/kernel/qobject/tst_bench_qobject.cpp
index 918227f74e..0f57f2997a 100644
--- a/tests/benchmarks/corelib/kernel/qobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qobject/tst_bench_qobject.cpp
@@ -37,7 +37,7 @@ enum {
     SignalsAndSlotsBenchmarkConstant = 456789
 };
 
-class QObjectBenchmark : public QObject
+class tst_QObject : public QObject
 {
 Q_OBJECT
 private slots:
@@ -95,7 +95,7 @@ inline void allocator()
     }
 }
 
-void QObjectBenchmark::stdAllocator()
+void tst_QObject::stdAllocator()
 {
     allocator<QObjectUsingStandardAllocator>();
 }
@@ -104,7 +104,7 @@ struct Functor {
     void operator()(){}
 };
 
-void QObjectBenchmark::signal_slot_benchmark_data()
+void tst_QObject::signal_slot_benchmark_data()
 {
     QTest::addColumn<int>("type");
     QTest::newRow("simple function") << 0;
@@ -115,7 +115,7 @@ void QObjectBenchmark::signal_slot_benchmark_data()
     QTest::newRow("functor") << 5;
 }
 
-void QObjectBenchmark::signal_slot_benchmark()
+void tst_QObject::signal_slot_benchmark()
 {
     QFETCH(int, type);
 
@@ -176,7 +176,7 @@ void QObjectBenchmark::signal_slot_benchmark()
     }
 }
 
-void QObjectBenchmark::signal_many_receivers_data()
+void tst_QObject::signal_many_receivers_data()
 {
     QTest::addColumn<int>("receiverCount");
     QTest::newRow("100 receivers") << 100;
@@ -184,7 +184,7 @@ void QObjectBenchmark::signal_many_receivers_data()
     QTest::newRow("10 000 receivers") << 10000;
 }
 
-void QObjectBenchmark::signal_many_receivers()
+void tst_QObject::signal_many_receivers()
 {
     QFETCH(int, receiverCount);
     Object sender;
@@ -198,7 +198,7 @@ void QObjectBenchmark::signal_many_receivers()
     }
 }
 
-void QObjectBenchmark::qproperty_benchmark_data()
+void tst_QObject::qproperty_benchmark_data()
 {
     QTest::addColumn<QByteArray>("name");
     const QMetaObject *mo = &QTreeView::staticMetaObject;
@@ -209,7 +209,7 @@ void QObjectBenchmark::qproperty_benchmark_data()
     }
 }
 
-void QObjectBenchmark::qproperty_benchmark()
+void tst_QObject::qproperty_benchmark()
 {
     QFETCH(QByteArray, name);
     const char *p = name.constData();
@@ -221,7 +221,7 @@ void QObjectBenchmark::qproperty_benchmark()
     }
 }
 
-void QObjectBenchmark::dynamic_property_benchmark()
+void tst_QObject::dynamic_property_benchmark()
 {
     QTreeView obj;
     QBENCHMARK {
@@ -232,7 +232,7 @@ void QObjectBenchmark::dynamic_property_benchmark()
     }
 }
 
-void QObjectBenchmark::connect_disconnect_benchmark_data()
+void tst_QObject::connect_disconnect_benchmark_data()
 {
     QTest::addColumn<int>("type");
     QTest::newRow("normalized signature") << 0;
@@ -243,7 +243,7 @@ void QObjectBenchmark::connect_disconnect_benchmark_data()
     QTest::newRow("function pointer/handle") << 5;
     QTest::newRow("functor/handle") << 6;}
 
-void QObjectBenchmark::connect_disconnect_benchmark()
+void tst_QObject::connect_disconnect_benchmark()
 {
     QFETCH(int, type);
     switch (type) {
@@ -296,7 +296,7 @@ void QObjectBenchmark::connect_disconnect_benchmark()
     }
 }
 
-void QObjectBenchmark::receiver_destroyed_benchmark()
+void tst_QObject::receiver_destroyed_benchmark()
 {
     Object sender;
     QBENCHMARK {
@@ -305,6 +305,6 @@ void QObjectBenchmark::receiver_destroyed_benchmark()
     }
 }
 
-QTEST_MAIN(QObjectBenchmark)
+QTEST_MAIN(tst_QObject)
 
-#include "main.moc"
+#include "tst_bench_qobject.moc"