From 4b8aee7ca089ecf7509bbbb2369cc15a6432ab03 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 25 Feb 2014 10:20:39 +0200 Subject: [PATCH] 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 Reviewed-by: Liang Qi --- tests/auto/corelib/tools/qchar/qchar.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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