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>

2 files changed, 7 insertions, 9 deletions

diff --git a/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro
index 918ef398ba..68d0f1202b 100644
--- a/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro
+++ b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.pro
@@ -2,3 +2,7 @@ SOURCES += crashOnExit.cpp
 QT = core
 CONFIG-=app_bundle
 CONFIG+=console
+
+# This app is testdata for tst_qthreadstorage
+target.path = $$[QT_INSTALL_TESTS]/tst_qthreadstorage
+INSTALLS += target
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index ceb74b3849..e0fa30be19 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -291,15 +291,9 @@ void tst_QThreadStorage::ensureCleanupOrder()
 void tst_QThreadStorage::crashOnExit()
 {
     QProcess process;
-#ifdef Q_OS_WIN
-# ifdef QT_NO_DEBUG
-    process.start("release/crashOnExit");
-# else
-    process.start("debug/crashOnExit");
-# endif
-#else
-    process.start("./crashOnExit");
-#endif
+    // crashOnExit is always expected to be in the same directory
+    // as this test binary
+    process.start(QCoreApplication::applicationDirPath() + "/crashOnExit");
     QVERIFY(process.waitForFinished());
     QVERIFY(process.exitStatus() != QProcess::CrashExit);
 }