6 files changed, 41 insertions, 39 deletions
diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
index e83c4e9acc..d1feaa5f18 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
@@ -1,15 +1,10 @@
-# Generated from 10000.pro.
-
 #####################################################################
 ## tst_bench_qdir_10000 Binary:
 #####################################################################
 
 qt_internal_add_benchmark(tst_bench_qdir_10000
     SOURCES
-        bench_qdir_10000.cpp
+        tst_bench_qdir_10000.cpp
     PUBLIC_LIBRARIES
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:10000.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp
index e02cfb3099..4ed1246a6c 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
+++ b/tests/benchmarks/corelib/io/qdir/10000/tst_bench_qdir_10000.cpp
@@ -38,10 +38,12 @@
 #   include <unistd.h>
 #endif
 
-class bench_QDir_10000 : public QObject{
-  Q_OBJECT
+class tst_QDir_10000 : public QObject
+{
+    Q_OBJECT
 public slots:
-    void initTestCase() {
+    void initTestCase()
+    {
         QDir testdir = QDir::tempPath();
 
         const QString subfolder_name = QLatin1String("test_speed");
@@ -53,7 +55,8 @@ public slots:
             file.open(QIODevice::WriteOnly);
         }
     }
-    void cleanupTestCase() {
+    void cleanupTestCase()
+    {
         {
             QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
             testdir.setSorting(QDir::Unsorted);
@@ -68,7 +71,8 @@ public slots:
 private slots:
     void baseline() {}
 
-    void sizeSpeed() {
+    void sizeSpeed()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
             QFileInfoList fileInfoList = testdir.entryInfoList(QDir::Files, QDir::Unsorted);
@@ -78,7 +82,8 @@ private slots:
             }
         }
     }
-    void sizeSpeedIterator() {
+    void sizeSpeedIterator()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
             QDirIterator dit(testdir.path(), QDir::Files);
@@ -90,7 +95,8 @@ private slots:
         }
     }
 
-    void sizeSpeedWithoutFilter() {
+    void sizeSpeedWithoutFilter()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
             QFileInfoList fileInfoList = testdir.entryInfoList(QDir::NoFilter, QDir::Unsorted);
@@ -99,7 +105,8 @@ private slots:
             }
         }
     }
-    void sizeSpeedWithoutFilterIterator() {
+    void sizeSpeedWithoutFilterIterator()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         QBENCHMARK {
             QDirIterator dit(testdir.path());
@@ -111,7 +118,8 @@ private slots:
         }
     }
 
-    void sizeSpeedWithoutFileInfoList() {
+    void sizeSpeedWithoutFileInfoList()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         testdir.setSorting(QDir::Unsorted);
         QBENCHMARK {
@@ -123,7 +131,8 @@ private slots:
         }
     }
 
-    void iDontWantAnyStat() {
+    void iDontWantAnyStat()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         testdir.setSorting(QDir::Unsorted);
         testdir.setFilter(QDir::AllEntries | QDir::System | QDir::Hidden);
@@ -134,7 +143,8 @@ private slots:
             }
         }
     }
-    void iDontWantAnyStatIterator() {
+    void iDontWantAnyStatIterator()
+    {
         QBENCHMARK {
             QDirIterator dit(QDir::tempPath() + QLatin1String("/test_speed"));
             while (dit.hasNext()) {
@@ -143,7 +153,8 @@ private slots:
         }
     }
 
-    void sorted_byTime() {
+    void sorted_byTime()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         testdir.setSorting(QDir::Time);
         testdir.setFilter(QDir::AllEntries | QDir::System | QDir::Hidden);
@@ -155,7 +166,8 @@ private slots:
         }
     }
 
-    void sizeSpeedWithoutFilterLowLevel() {
+    void sizeSpeedWithoutFilterLowLevel()
+    {
         QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
 #ifdef Q_OS_WIN
         const wchar_t *dirpath = (wchar_t*)testdir.absolutePath().utf16();
@@ -194,5 +206,6 @@ private slots:
     }
 };
 
-QTEST_MAIN(bench_QDir_10000)
-#include "bench_qdir_10000.moc"
+QTEST_MAIN(tst_QDir_10000)
+
+#include "tst_bench_qdir_10000.moc"
diff --git a/tests/benchmarks/corelib/io/qdir/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/CMakeLists.txt
index 10185014fa..f1800fc0cd 100644
--- a/tests/benchmarks/corelib/io/qdir/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdir/CMakeLists.txt
@@ -1,3 +1,2 @@
-# Generated from qdir.pro.
-
 add_subdirectory(10000)
+add_subdirectory(tree)
diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
index c60bfcfdc3..32dea04edc 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
+++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
@@ -1,28 +1,22 @@
-# Generated from tree.pro.
-
 #####################################################################
-## bench_qdir_tree Binary:
+## tst_bench_qdir_tree Binary:
 #####################################################################
 
-qt_internal_add_benchmark(bench_qdir_tree
+qt_internal_add_benchmark(tst_bench_qdir_tree
     SOURCES
-        bench_qdir_tree.cpp
+        tst_bench_qdir_tree.cpp
     PUBLIC_LIBRARIES
         Qt::Test
 )
 
 # Resources:
-set(bench_qdir_tree_resource_files
+set(qdir_tree_resource_files
     "4.6.0-list.txt"
 )
 
-qt_internal_add_resource(bench_qdir_tree "bench_qdir_tree"
+qt_internal_add_resource(tst_bench_qdir_tree "tst_bench_qdir_tree"
     PREFIX
         "/"
     FILES
-        ${bench_qdir_tree_resource_files}
+        ${qdir_tree_resource_files}
 )
-
-
-#### Keys ignored in scope 1:.:.:tree.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp b/tests/benchmarks/corelib/io/qdir/tree/tst_bench_qdir_tree.cpp
index df16a7978a..d960cb41e2 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
+++ b/tests/benchmarks/corelib/io/qdir/tree/tst_bench_qdir_tree.cpp
@@ -35,13 +35,13 @@
 
 #include "../../../../../shared/filesystem.h"
 
-class bench_QDir_tree
+class tst_QDir_tree
     : public QObject
 {
     Q_OBJECT
 
 public:
-    bench_QDir_tree()
+    tst_QDir_tree()
         : prefix("test-tree/"),
           musicprefix(QLatin1String("music")),
           photoprefix(QLatin1String("photos")),
@@ -221,5 +221,6 @@ private slots:
     }
 };
 
-QTEST_MAIN(bench_QDir_tree)
-#include "bench_qdir_tree.moc"
+QTEST_MAIN(tst_QDir_tree)
+
+#include "tst_bench_qdir_tree.moc"
diff --git a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.qrc b/tests/benchmarks/corelib/io/qdir/tree/tst_bench_qdir_tree.qrc
index d57cb6c368..d57cb6c368 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.qrc
+++ b/tests/benchmarks/corelib/io/qdir/tree/tst_bench_qdir_tree.qrc