summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2012-01-20 01:27:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-24 01:08:55 +0100
commitf61112aa323747714e9a644095b2c5b946bb8179 (patch)
tree6de8e76147b89117b6bc6816a475f8fbc660516c /tests
parent2c3221dd07b88fe047a6a0e4ee0d1a20b940162c (diff)
Move test files around.
main.cpp is easier for my muscle memory to remember than qhash_string as it is used by a number of other tests. Change-Id: I044f995d55a4ff1328dde0ae27b6e36a80114c38 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/corelib/tools/qhash/main.cpp (renamed from tests/benchmarks/corelib/tools/qhash/qhash_string.cpp)4
-rw-r--r--tests/benchmarks/corelib/tools/qhash/main.h (renamed from tests/benchmarks/corelib/tools/qhash/qhash_string.h)0
-rw-r--r--tests/benchmarks/corelib/tools/qhash/outofline.cpp2
-rw-r--r--tests/benchmarks/corelib/tools/qhash/qhash.pro2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/benchmarks/corelib/tools/qhash/qhash_string.cpp b/tests/benchmarks/corelib/tools/qhash/main.cpp
index 36e9f41cb7..463f16393a 100644
--- a/tests/benchmarks/corelib/tools/qhash/qhash_string.cpp
+++ b/tests/benchmarks/corelib/tools/qhash/main.cpp
@@ -66,7 +66,7 @@ Totals: 4 passed, 0 failed, 0 skipped
*/
-#include "qhash_string.h"
+#include "main.h"
#include <QFile>
#include <QHash>
@@ -144,4 +144,4 @@ void tst_QHash::javaString()
QTEST_MAIN(tst_QHash)
-#include "qhash_string.moc"
+#include "main.moc"
diff --git a/tests/benchmarks/corelib/tools/qhash/qhash_string.h b/tests/benchmarks/corelib/tools/qhash/main.h
index cd2dea576f..cd2dea576f 100644
--- a/tests/benchmarks/corelib/tools/qhash/qhash_string.h
+++ b/tests/benchmarks/corelib/tools/qhash/main.h
diff --git a/tests/benchmarks/corelib/tools/qhash/outofline.cpp b/tests/benchmarks/corelib/tools/qhash/outofline.cpp
index 5f067da2e1..88fd9c144d 100644
--- a/tests/benchmarks/corelib/tools/qhash/outofline.cpp
+++ b/tests/benchmarks/corelib/tools/qhash/outofline.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qhash_string.h"
+#include "main.h"
static void doHash(const unsigned short *p, uint &h)
{
diff --git a/tests/benchmarks/corelib/tools/qhash/qhash.pro b/tests/benchmarks/corelib/tools/qhash/qhash.pro
index 51d3e7f253..40f661c116 100644
--- a/tests/benchmarks/corelib/tools/qhash/qhash.pro
+++ b/tests/benchmarks/corelib/tools/qhash/qhash.pro
@@ -1,5 +1,5 @@
TARGET = tst_hash
QT = core testlib
INCLUDEPATH += .
-SOURCES += qhash_string.cpp outofline.cpp
+SOURCES += main.cpp outofline.cpp
CONFIG += release