summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2014-02-25 10:20:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-14 18:19:00 +0100
commit4b8aee7ca089ecf7509bbbb2369cc15a6432ab03 (patch)
treea1eb193ce1ac930286f193195f5a4d5b3dfcc05f /tests
parenta7e58bf253d08b896df3bbf247bbbaae718e426d (diff)
Fix qchar testdata installation.
NormalizationTest.txt does not exist in the project root, but under 'data' directory. TESTDATA is converted to INSTALLS rules in testcase.prf. INSTALLS rules generated in testcase.prf does not set 'no_check_exist' CONFIG variable. Thus qmake will not install NormalizationTest.txt since it cannot find it from defined location. Even TESTDATA has been incorrectly defined, NormalizationTest.txt has been found in majority of the platforms thanks to QFINDTESTDATA flexibility. However it causes problems on sand-boxed platforms such as WinRT. Fixed by defining the relative path to NormalizationTest.txt in TESTDATA so that qmake can find the file when processing INSTALLS variable. Change-Id: Id9a28db2a00b17d2c0136e6ff32f421b21137898 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/tools/qchar/qchar.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qchar/qchar.pro b/tests/auto/corelib/tools/qchar/qchar.pro
index 7b36b2e45e..0738abad3a 100644
--- a/tests/auto/corelib/tools/qchar/qchar.pro
+++ b/tests/auto/corelib/tools/qchar/qchar.pro
@@ -3,5 +3,5 @@ TARGET = tst_qchar
QT = core-private testlib
SOURCES = tst_qchar.cpp
-TESTDATA += NormalizationTest.txt
+TESTDATA += data/NormalizationTest.txt
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0