--- a/buildframework/helium/tests/minibuilds/qt/build.xml	Fri Feb 05 11:59:41 2010 +0000
+++ b/buildframework/helium/tests/minibuilds/qt/build.xml	Thu Mar 04 15:10:37 2010 +0200
@@ -40,8 +40,8 @@
     <property name="publish.root.dir" location="${build.drive}/release" />
 
     <!-- For Grace upload-->
-    <property name="release.grace.service" value="Test_Helium" />
-    <property name="release.grace.product" value="minibuild_qt" />
+    <property name="hydra.service" value="Helium" />
+    <property name="hydra.product" value="minibuild_qt" />
     <property name="release.label" value="${major.version}.${minor.version}" />
 
     <!-- build configuration -->
@@ -211,10 +211,7 @@
     <target name="mini-build-check">
         <!-- Checking that the qmake command line have been generated correctly -->
         <if>
-            <or>
-                <equals arg1="${build.system}" arg2="ec-helium" />
-                <equals arg1="${build.system}" arg2="sbs-ec" />
-            </or>
+            <equals arg1="${build.system}" arg2="ec-helium" />
             <then>
                 <au:assertFileExists file="${temp.build.dir}/run-qmake-build.mk" />
                 <loadfile property="qmake.build.makefile" srcFile="${temp.build.dir}/run-qmake-build.mk"/>
@@ -225,16 +222,44 @@
                     </and>
                 </au:assertTrue>
             </then>
-            <else>
-                <xpathtest xmlfile="${temp.build.dir}/run-qmake-build.ant.xml">  
+        </if>
+        <if>
+            <equals arg1="${build.system}" arg2="sbs-ec" />
+            <then>
+                <au:assertFileExists file="${temp.build.dir}/run-qmake-build.mk" />
+                <loadfile property="qmake.build.makefile" srcFile="${temp.build.dir}/run-qmake-build.mk"/>
+                <au:assertTrue>
+                    <and>
+                        <contains string="${qmake.build.makefile}" substring="qmake -listgen -r  -spec symbian-sbsv2 src.pro" />
+                        <contains string="${qmake.build.makefile}" substring="qmake -listgen -r  -spec symbian-sbsv2 examples.pro" />
+                    </and>
+                </au:assertTrue>
+            </then>
+        </if>
+        <if>
+            <equals arg1="${build.system}" arg2="sbs" />
+            <then>
+                <xpathtest xmlfile="${temp.build.dir}/run-qmake-build.ant.xml">
                     <namespace uri="" prefix=""/>
                     <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@value='-listgen']"/>
                     <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r']"/>
                     <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r -listgen']"/>
+                    <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r -listgen']"/>
+                    <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-spec symbian-sbsv2']"/>
                 </xpathtest>
-            </else>
+            </then>
         </if>
-        
+        <if>
+            <equals arg1="${build.system}" arg2="ebs" />
+            <then>
+                    <xpathtest xmlfile="${temp.build.dir}/run-qmake-build.ant.xml">
+                        <namespace uri="" prefix=""/>
+                        <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@value='-listgen']"/>
+                        <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r']"/>
+                        <xpath expression="/project/target[@name='all']/parallel/sequential/if/then/exec/arg[@line='-r -listgen']"/>
+                    </xpathtest>
+            </then>
+        </if>
         <!-- Check if prep has set some prop correctly... -->
         <echo>'${arm.compiler.version}'</echo>
         <au:assertMatches string="${arm.compiler.version}" pattern="RVCT2\.2 \[Build 616\]" casesensitive="false" multiline="true" />