# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1272984758 -3600
# Node ID e9f653f5e2d632329a359dded61409422b41eb68
# Parent  242cdb4f2fea305c83894cbcac4312869aa59eaf# Parent  0c7be4cd56d89828cce40508346ca0649ee4ed96
Merge

diff -r 0c7be4cd56d8 -r e9f653f5e2d6 symbian4/single/job_props.ant.xml
--- a/symbian4/single/job_props.ant.xml	Tue May 04 15:50:24 2010 +0100
+++ b/symbian4/single/job_props.ant.xml	Tue May 04 15:52:38 2010 +0100
@@ -34,7 +34,7 @@
 
     <!-- get full source env and binaries from pdk -->
     <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\overlay_default.11" /> <!-- for TEF,Qmake etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
@@ -78,7 +78,4 @@
     <!-- Build ROMs from iMaker config defined in job_refs.ant.xml -->
     <property name="sf.spec.referenceroms.createimages.enable" value="false"/>
 
-    <!-- run qmake for anything units with proFile attribs -->
-    <property name="qmake.enabled" value="true"/>
-
 </project>
diff -r 0c7be4cd56d8 -r e9f653f5e2d6 symbian4/single/sources.csv
--- a/symbian4/single/sources.csv	Tue May 04 15:50:24 2010 +0100
+++ b/symbian4/single/sources.csv	Tue May 04 15:52:38 2010 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,