# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1272579194 -3600
# Node ID b89c1ad56824783e808b1d47cdf36e5519c9605b
# Parent  1a9b749add1a5c71e02e9d0f3a0d6ed75f6ba316
Run qmake on Qt package before Orbit

diff -r 1a9b749add1a -r b89c1ad56824 common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Wed Apr 28 23:14:14 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Thu Apr 29 23:13:14 2010 +0100
@@ -6,6 +6,32 @@
     <then>
             <sequential>
     <#list data["//unit/@proFile/.."] as unit>
+          <#if (unit.@proFile=="projects.pro")>
+                <echo>Running qmake for ${unit.@bldFile}/${unit.@proFile}</echo>
+                <if>
+                    <available file="${r'$'}{build.drive}/${unit.@bldFile}" type="dir"/>
+                    <then>
+                        <exec executable="cmd" dir="${r'$'}{build.drive}/${unit.@bldFile}" failonerror="false">
+                            <arg value="/C"/>
+                            <arg value="qmake"/>
+                            <!-- arg value="-listgen"/ -->
+                            <#if unit.@qmakeArgs[0]??>
+                            <arg line="${unit.@qmakeArgs?xml}"/>
+                            <#else>
+                            <arg line="${ant['qt.qmake.default.args']?xml}"/>
+                            </#if>
+                            <arg value="${unit.@proFile?xml}"/>
+                        </exec>
+                    </then>
+                    <else>
+                       <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/>
+                    </else>
+                </if>          
+	  </#if>
+    </#list>
+            </sequential>
+            <sequential>
+    <#list data["//unit/@proFile/.."] as unit>
           <#if (unit.@proFile=="hb.pro")>
                 <echo>Running configure.py for ${unit.@bldFile}/${unit.@proFile}</echo>
                 <if>