From 38d3ddcd5bc5024a2d26cd8507fdd53dcc41b932 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Thu, 3 Feb 2011 17:56:33 +0100
Subject: [PATCH] Autotests: change to make tests run in-place

This change sets the path temporarily on win32 so that the testcases when
executed with "make check" find the necessary dll's in the main build directory.
---
 tests/auto/qttest.pri | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri
index 440ad138e53..21be797385f 100644
--- a/tests/auto/qttest.pri
+++ b/tests/auto/qttest.pri
@@ -1,4 +1,5 @@
 include(../../qtcreator.pri)
+include(qttestrpath.pri)
 
 isEmpty(TEMPLATE):TEMPLATE=app
 CONFIG += qt warn_on console depend_includepath testcase qtestlib
@@ -11,7 +12,12 @@ symbian:{
     RSS_RULES ="group_name=\"QtTests\";"
 }
 
-include(qttestrpath.pri)
-
 # prefix test binary with tst_
 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
+
+win32 {
+    lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/Nokia
+    lib ~= s,/,\\,g
+    # the below gets added to later by testcase.prf
+    check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c
+}