# HG changeset patch
# User brendand@symbian.org
# Date 1277382592 -3600
# Node ID 82b232da6082af52991bc3187ef28c8390a3cffe
# Parent  794ddd7e666ad27d1607daaf60e9c1cd3322fcfb# Parent  488afbbbaebd5ee2148c2fd6ef9a7da23a9e54f3
Merge

diff -r 488afbbbaebd -r 82b232da6082 common/build.test.xml
--- a/common/build.test.xml	Tue Jun 22 12:55:01 2010 +0100
+++ b/common/build.test.xml	Thu Jun 24 13:29:52 2010 +0100
@@ -142,9 +142,26 @@
 	
 	<target name="sf-build-smoketestpkg" depends="sf-getenv-tools">
         <echo message="INFO Building smoketest"/>
+         <fmpp sourceFile="${qt.qmake.ant.template}" outputFile="${temp.build.dir}/run-qmake-test.ant.xml">
+            <data expandProperties="yes">
+                data: xml(${build.drive}/smoketest/package_definition.xml)
+                ant: antProperties()
+
+            </data>
+        </fmpp>
+		<hlm:assertFileExists xmlns:hlm="http://www.nokia.com/helium" file="${temp.build.dir}/run-qmake-test.ant.xml"/>
+
+		<!-- Running the qmake steps -->
+        <ant antfile="${temp.build.dir}/run-qmake-test.ant.xml" dir="${build.drive}/" output="${compile.log.dir}/${build.id}_test.qmake.log"/>
+		
         <exec executable="cmd" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
             <arg value="/c"/>
-            <arg value="sbs -b bld.inf -c winscw_udeb.test"/>
+            <arg value="sbs -b bld.inf -c winscw_udeb -s package_definition.xml"/>
+        </exec>
+		
+        <exec executable="cmd" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+            <arg value="/c"/>
+            <arg value="sbs -b bld.inf -c winscw_udeb.test -s package_definition.xml"/>
         </exec>
 
         <echo message="INFO Creating smoketest testpackage"/>
diff -r 488afbbbaebd -r 82b232da6082 common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Tue Jun 22 12:55:01 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Thu Jun 24 13:29:52 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="run-qmake-${ant['sysdef.configuration']}" default="all">
+<project name="run-qmake" default="all">
 
     <target name="all">