# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1276870364 -3600
# Node ID 232bce64d3709dee8c2b80bf60a41b65edc170f8
# Parent  0a2d5d0db21168d211c5e833042fef557f90e4c6
Build Qmake only if Qt package is being built

diff -r 0a2d5d0db211 -r 232bce64d370 common/build.xml
--- a/common/build.xml	Mon Jun 14 16:10:45 2010 +0100
+++ b/common/build.xml	Fri Jun 18 15:12:44 2010 +0100
@@ -741,7 +741,7 @@
     
     <!-- Unpack the rnd zips ready to be used in the build -->
     <target name="sf-unpack-rnd">
-        <echo message="Unpacking any available RnD binaries"/>
+        <echo message="INFO Unpacking any available RnD binaries"/>
         <for param="rndZip">
             <fileset dir="${build.drive}/output/zips/">
                 <include name="binaries_*.zip"/> <!-- Internal rnd bins -->
diff -r 0a2d5d0db211 -r 232bce64d370 common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Mon Jun 14 16:10:45 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Fri Jun 18 15:12:44 2010 +0100
@@ -3,10 +3,12 @@
 
     <target name="all">
 
-    <if><not><available file="${r'$'}{build.drive}/epoc32/tools/qt/qmake.exe" type="file"/></not>
+    <!-- Qmake needs to have been built in this environment, to generate bld.infs to built Qt itself.  
+         Qmake.exe only exists in the source tree if its been built  -->
+
+    <if><not><available file="${r'$'}{build.drive}/sf/mw/qt/bin/qmake.exe" type="file"/></not>
     <then>
 	        <sequential>
-
 	<#list data["//unit/@bldFile/.."] as unit>
           <#if (unit.@bldFile=="/sf/mw/qt/src/s60installs/deviceconfiguration")>
                 <echo>INFO: Building and configuring qmake for ${unit.@bldFile}</echo>