diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /tests/benchmarks/corelib/tools | |
parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'tests/benchmarks/corelib/tools')
5 files changed, 7 insertions, 9 deletions
diff --git a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro b/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro index 00b63f9863..f54f8320d4 100644 --- a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro +++ b/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro @@ -1,3 +1,3 @@ -TARGET = tst_qalgorithms +TARGET = tst_bench_qalgorithms QT = core testlib SOURCES = tst_qalgorithms.cpp diff --git a/tests/benchmarks/corelib/tools/qlist/qlist.pro b/tests/benchmarks/corelib/tools/qlist/qlist.pro index bb69d7651d..c83bc455d2 100644 --- a/tests/benchmarks/corelib/tools/qlist/qlist.pro +++ b/tests/benchmarks/corelib/tools/qlist/qlist.pro @@ -1,4 +1,4 @@ -TARGET = tst_qlist +TARGET = tst_bench_qlist QT = core testlib SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 9d5c43c290..9b10e97f2b 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -1408,7 +1408,9 @@ void tst_QString::ucstrncmp() const void tst_QString::fromUtf8() const { - QFile file(SRCDIR "utf-8.txt"); + QString testFile = QFINDTESTDATA("utf-8.txt"); + QVERIFY2(!testFile.isEmpty(), "cannot find test file utf-8.txt!"); + QFile file(testFile); if (!file.open(QFile::ReadOnly)) { qFatal("Cannot open input file"); return; diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 72300de9da..cf2ee24c6d 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -3,11 +3,7 @@ QT -= gui QT += core-private testlib SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp -wince*:{ - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +TESTDATA = utf-8.txt sse4:QMAKE_CXXFLAGS += -msse4 else:ssse3:QMAKE_FLAGS += -mssse3 diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro index 78a56adcd6..e24b16230a 100644 --- a/tests/benchmarks/corelib/tools/qvector/qvector.pro +++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro @@ -1,4 +1,4 @@ -TARGET = tst_vector +TARGET = tst_bench_vector QT = core testlib INCLUDEPATH += . SOURCES += main.cpp outofline.cpp |