# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1274878000 -3600
# Node ID ee03efed9e3ce427d26e53dac9d08f3a0890c8ef
# Parent  871bdf0d761034876b07082970033202a728c461
Change Qt qmake order to allow -config qmake args to be passed correctly

diff -r 871bdf0d7610 -r ee03efed9e3c common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Tue May 25 20:30:36 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Wed May 26 13:46:40 2010 +0100
@@ -76,7 +76,7 @@
     <#list data["//unit/@proFile/.."] as unit>
             <sequential>
 
-          <#if (unit.@proFile!="hb.pro")>
+          <#if (unit.@proFile!="projects.pro" && unit.@proFile!="hb.pro")>
 
                 <echo>Running qmake for ${unit.@bldFile}/${unit.@proFile}</echo>
                 <if>
@@ -105,6 +105,32 @@
     </#list>
         </parallel>
 
+            <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>
     </target>
     
 </project>