From 2d8d258f1dd475c3d7aad2629c79d9be5087cbab Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 5 Dec 2011 14:08:22 +1000 Subject: Fixed tst_selftests findtestdata subtest for shadow builds. This test uses qt.conf to enforce a predictable tests install location. This was not working in the shadow build case, as qt.conf was only present in the source tree; embed it as a resource at :/qt/etc/qt.conf so it works in the shadow build case too. Change-Id: Iec708d9686c29a1fc5ff0020dc11a93a593d20c5 Reviewed-by: Jason McDonald --- tests/auto/testlib/selftests/findtestdata/findtestdata.pro | 1 + tests/auto/testlib/selftests/findtestdata/findtestdata.qrc | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 tests/auto/testlib/selftests/findtestdata/findtestdata.qrc (limited to 'tests') diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro index 6e072aeb6f..f04a640c59 100644 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.pro +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.pro @@ -4,5 +4,6 @@ QT = core testlib mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target +RESOURCES = findtestdata.qrc TARGET = findtestdata diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc b/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc new file mode 100644 index 0000000000..cb3eee30d2 --- /dev/null +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.qrc @@ -0,0 +1,5 @@ + + + qt.conf + + -- cgit v1.2.3