Standardise layout and naming in corelib benchmarks

Make file names match CMake's test names (and those follow dir-name)
and class names follow tst_ClassName pattern when testing
ClassName. Purge comments about the qmake configs the CMakeLists.txt
are generated from.  Purge empty constructors and init/cleanup methods
of classes.  Fix petty coding style violations.

Add qdir/tree/, qurl, qbench and qset benchmarks to their parent directories'
lists of subdirs. Fix unused return error from qurl benchmark.

Change-Id: Ifc15a3a46e71cf82ad0637753517e0df34049763
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 3 insertions, 8 deletions

diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
index 68c6e88342..13814d7074 100644
--- a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -1,15 +1,10 @@
-# Generated from qwaitcondition.pro.
-
 #####################################################################
 ## tst_bench_qwaitcondition Binary:
 #####################################################################
 
 qt_internal_add_benchmark(tst_bench_qwaitcondition
     SOURCES
-        tst_qwaitcondition.cpp
+        tst_bench_qwaitcondition.cpp
     PUBLIC_LIBRARIES
         Qt::Test
 )
-
-#### Keys ignored in scope 1:.:.:qwaitcondition.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp
index b87da463dc..19d3964c7a 100644
--- a/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/tst_bench_qwaitcondition.cpp
@@ -124,6 +124,6 @@ void tst_QWaitCondition::oscillate_writelock()
     oscillate<QReadWriteLock, QWriteLocker>(timeout);
 }
 
-
 QTEST_MAIN(tst_QWaitCondition)
-#include "tst_qwaitcondition.moc"
+
+#include "tst_bench_qwaitcondition.moc"