diff -r 70d88996e8cd -r 17aa569095fc common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl Wed Jul 28 14:18:15 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl Mon Aug 02 17:40:29 2010 +0100
@@ -6,86 +6,84 @@
-
-
-
- <#list data["//unit/@bldFile/.."] as unit>
- <#if (unit.@bldFile=="/sf/mw/qt/src/s60installs/deviceconfiguration")>
- INFO: Building and configuring qmake for ${unit.@bldFile}
-
-
-
-
-
-
-
-
-
-
-
-
-
- #if>
- #list>
-
-
-
-
+
+
+
+ <#list data["//unit/@bldFile/.."] as unit>
+ <#if (unit.@bldFile=="/sf/mw/qt/src/s60installs/deviceconfiguration")>
+ INFO: Building and configuring qmake for ${unit.@bldFile}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #if>
+ #list>
+
+
+
- <#list data["//unit/@bldFile/.."] as unit>
- <#if (unit.@bldFile=="/sf/mw/qtextensions/group")>
- INFO: Configuring qtextensions for ${unit.@bldFile}
-
-
-
-
-
-
-
-
-
-
-
-
- #if>
- #list>
-
-
-
- <#list data["//unit/@proFile/.."] as unit>
- <#if (unit.@proFile=="hb.pro")>
- Running configure.py for ${unit.@bldFile}/${unit.@proFile}
-
-
-
-
-
-
-
-
+
+ <#list data["//unit/@bldFile/.."] as unit>
+ <#if (unit.@bldFile=="/sf/mw/qtextensions/group")>
+ INFO: Configuring qtextensions for ${unit.@bldFile}
+
+
+
+
+
+
+
+
+
+
+
+
+ #if>
+ #list>
+
+
+
+ <#list data["//unit/@proFile/.."] as unit>
+ <#if (unit.@proFile=="hb.pro")>
+ Running configure.py for ${unit.@bldFile}/${unit.@proFile}
+
+
+
+
+
+
+
+
- INFO: Exporting Orbit mkspecs to epoc32\tools for ${unit.@bldFile}/${unit.@proFile}
- INFO: Running Orbit theme installer, make install step
-
-
-
-
-
-
-
-
-
- #if>
- #list>
+ INFO: Exporting Orbit mkspecs to epoc32\tools for ${unit.@bldFile}/${unit.@proFile}
+ INFO: Running Orbit theme installer, make install step
+
+
+
+
+
+
+
+
+
+ #if>
+ #list>
-
+
- <#list data["//unit/@proFile/.."] as unit>
+ <#list data["//unit/@proFile/.."] as unit>
-
- <#if (unit.@proFile!="hb.pro")>
-
+ <#if (unit.@proFile!="hb.pro")>
Running qmake for ${unit.@bldFile}/${unit.@proFile}
@@ -94,11 +92,11 @@
- <#if unit.@qmakeArgs[0]??>
+ <#if unit.@qmakeArgs[0]??>
- <#else>
+ <#else>
- #if>
+ #if>
@@ -106,11 +104,9 @@
- #if>
-
-
+ #if>
- #list>
+ #list>