diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-24 10:36:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 09:12:52 +0100 |
| commit | 3385fb91e1e55e1bfa1f78dfb8ce2e9f3fdaedef (patch) | |
| tree | b77bb527bf3a21dc95a317248b2640c73751f629 /tests/auto/corelib/tools/qchar | |
| parent | 13eba9ddf47d570fc4562c20fcfbacd1dfa4a61a (diff) | |
Fixed installation of corelib tests
In .pro files, removed wince/symbian-specific DEPLOYMENT cases and
replaced them with TESTDATA where appropriate.
In .cpp files, removed SRCDIR and relative paths to testdata and
replaced them with the QFINDTESTDATA macro where appropriate.
Modified test helper apps/libs to install themselves under the test
they relate to.
This change allows corelib tests to be correctly installed, along with
their testdata, via `make install'.
Change-Id: I5e202e2f3b577af7e39072d5c9fe13e0ca125304
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qchar')
| -rw-r--r-- | tests/auto/corelib/tools/qchar/qchar.pro | 7 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qchar/tst_qchar.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro index c0a9f1b1e5..4a7072cbc9 100644 --- a/tests/auto/corelib/tools/qchar/qchar.pro +++ b/tests/auto/corelib/tools/qchar/qchar.pro @@ -3,9 +3,4 @@ TARGET = tst_qchar QT = core-private testlib SOURCES = tst_qchar.cpp -wince* { - deploy.files += NormalizationTest.txt - DEPLOYMENT += deploy -} - -DEFINES += SRCDIR=\\\"$$PWD/\\\" +TESTDATA += NormalizationTest.txt diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp index 839103415f..652ad5e7c2 100644 --- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp @@ -583,7 +583,7 @@ void tst_QChar::normalization_data() int linenum = 0; int part = 0; - QFile f(SRCDIR "NormalizationTest.txt"); + QFile f(QFINDTESTDATA("NormalizationTest.txt")); QVERIFY(f.exists()); f.open(QIODevice::ReadOnly); |