Fixed tst_selftests findtestdata subtest for shadow builds.
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 5 Dec 2011 04:08:22 +0000 (14:08 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 5 Dec 2011 05:00:04 +0000 (06:00 +0100)
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 <jason.mcdonald@nokia.com>
tests/auto/testlib/selftests/findtestdata/findtestdata.pro
tests/auto/testlib/selftests/findtestdata/findtestdata.qrc [new file with mode: 0644]

index 6e072ae..f04a640 100644 (file)
@@ -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 (file)
index 0000000..cb3eee3
--- /dev/null
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/qt/etc/" >
+        <file>qt.conf</file>
+    </qresource>
+</RCC>