Following commit 2ba625567fc7b615b0f1c9770983cf2dec9cc4f0, replace all tabs by 4
spaces, suppress spaces at end of lines, trim spaces on empty lines, etc, plus
ensure, as far as possible, that all lines fit into 80 characters.
---
 build.xml |  706 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 352 insertions(+), 354 deletions(-)

diff --git a/build.xml b/build.xml
index 9312d3b..ed6e1c5 100644
--- a/build.xml
+++ b/build.xml
@@ -5,12 +5,12 @@
 
     <tstamp/>
 
-    <property name="sourceDir" value="." />
-    <property name="outputDir" value="." />
+    <property name="sourceDir" value="."/>
+    <property name="outputDir" value="."/>
 
-    <property name="jambiLib" value="${outputDir}/lib" />
+    <property name="jambiLib" value="${outputDir}/lib"/>
 
-    <mkdir dir="${outputDir}/cpp" />
+    <mkdir dir="${outputDir}/cpp"/>
 
 
 
@@ -35,7 +35,7 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
     <condition property="ant-qtjambi.jar.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
+                <isset property="qtjambi.force"/>
             </not>
             <uptodate targetfile="${outputDir}/ant-qtjambi.jar" >
                 <srcfiles dir= "${sourceDir}"
@@ -44,9 +44,8 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </and>
     </condition>
 
-    <target name="init.ant"
-            unless="ant-qtjambi.jar.uptodate"
-            description="Creates a .jar file containing all the Qt Jambi ant 
tasks.">
+    <target name="init.ant" unless="ant-qtjambi.jar.uptodate"
+        description="Creates a .jar file containing all the Qt Jambi ant 
tasks.">
         <mkdir dir="${outputDir}/ant-qtjambi"/>
         <javac srcdir="${sourceDir}" destdir="${outputDir}/ant-qtjambi" 
target="1.5" debug="true">
             <include name="com/trolltech/tools/ant/*.java"/>
@@ -65,6 +64,7 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
       <property name="qtjambi.config.jumptable" value="jumptable"/>
       <property name="qtjambi.generator.jumptable" 
value="--native-jump-table"/>
     </target>
+
     <target name="init.jumptable.dont"
         description="Initialize the jump table..." 
unless="qtjambi.useJumpTable">
       <property name="qtjambi.config.jumptable" value=""/>
@@ -73,17 +73,22 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
 
     <target name="init.taskdef"
             depends="init.ant, init.jumptable.do, init.jumptable.dont">
-        <taskdef name="juic"      classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.JuicTask"/>
-        <taskdef name="qmake"     classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.QMakeTask"/>
-        <taskdef name="make"      classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.MakeTask"/>
-        <taskdef name="generator" classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.GeneratorTask"/>
-        <taskdef name="qtjambi-platform-jar" 
classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.PlatformJarTask"/>
-        <taskdef name="qtjambi-initialize" 
classpath="${outputDir}/ant-qtjambi.jar" 
classname="com.trolltech.tools.ant.InitializeTask"/>
-
-    </target>
-
-    <target name="clean"
-            description="Cleans everything.">
+        <taskdef name="juic" classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.JuicTask"/>
+        <taskdef name="qmake" classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.QMakeTask"/>
+        <taskdef name="make" classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.MakeTask"/>
+        <taskdef name="generator" classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.GeneratorTask"/>
+        <taskdef name="qtjambi-platform-jar" 
classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.PlatformJarTask"/>
+        <taskdef name="qtjambi-initialize" 
classpath="${outputDir}/ant-qtjambi.jar"
+            classname="com.trolltech.tools.ant.InitializeTask"/>
+
+    </target>
+
+    <target name="clean" description="Cleans everything.">
       <delete file="${outputDir}/ant-qtjambi.jar"/>
       <delete file="${outputDir}/qtjambi-${qtjambi.version}.jar"/>
       <delete file="${outputDir}/qtjambi-examples-${qtjambi.version}.jar"/>
@@ -96,22 +101,22 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
       <delete dir="${outputDir}/lib"/>
       <delete dir="${outputDir}/cpp"/>
       <delete includeEmptyDirs="true">
-        <fileset dir="${outputDir}" includes="**/*.class"/>
-        <fileset dir="${outputDir}" includes="**/*.o"/>
-        <fileset dir="${outputDir}" includes="**/moc_*.cpp"/>
-        <fileset dir="${outputDir}" includes="**/*.obj"/>
-        <fileset dir="${outputDir}" includes="**/*.pdb"/>
-        <fileset dir="${outputDir}" includes="**/*.ilk"/>
-        <fileset dir="${outputDir}" includes="**/release"/>
-        <fileset dir="${outputDir}" includes="**/debug"/>
-        <fileset dir="${outputDir}" includes="**/Makefile*"/>
+          <fileset dir="${outputDir}" includes="**/*.class"/>
+          <fileset dir="${outputDir}" includes="**/*.o"/>
+          <fileset dir="${outputDir}" includes="**/moc_*.cpp"/>
+          <fileset dir="${outputDir}" includes="**/*.obj"/>
+          <fileset dir="${outputDir}" includes="**/*.pdb"/>
+          <fileset dir="${outputDir}" includes="**/*.ilk"/>
+          <fileset dir="${outputDir}" includes="**/release"/>
+          <fileset dir="${outputDir}" includes="**/debug"/>
+          <fileset dir="${outputDir}" includes="**/Makefile*"/>
       </delete>
     </target>
 
-    <condition property="examples.juicfiles.uptodate"> 
+    <condition property="examples.juicfiles.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
+                <isset property="qtjambi.force"/>
             </not>
             <uptodate targetfile=".juic.run">
               <srcfiles dir="${outputDir}/com/trolltech/examples" 
includes="**/*.jui"/>
@@ -121,50 +126,41 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </and>
     </condition>
 
-    <target name="examples.juic"
-            depends="init"
-            description="Generates Java source files from JUI files created by 
designer."
-           unless="examples.juicfiles.uptodate">
-        <juic message="Running Juic for all it is worth"
-          outputDir="${outputDir}"
-              trFunction=""
-              classNamePrefix=""
-              alwaysUpdate="true"
-          classpath="${sourceDir}">
-         <include name="com/**/**.jui"/>
+    <target name="examples.juic" depends="init"
+        description="Generates Java source files from JUI files created by 
designer."
+        unless="examples.juicfiles.uptodate">
+        <juic message="Running Juic for all it is worth" trFunction=""
+            outputDir="${outputDir}" classNamePrefix="" alwaysUpdate="true"
+            classpath="${sourceDir}">
+            <include name="com/**/**.jui"/>
         </juic>
-       <touch file="${outputDir}/.juic.run"/>
+        <touch file="${outputDir}/.juic.run"/>
     </target>
 
     <target name="library.java.compile" depends="init">
-      <javac memoryMaximumSize="1024m"
-             fork="true"
-             destdir="${outputDir}"
-             debug="true"
-             target="1.5">
-        <src path="${outputDir}"/>
-        <src path="${sourceDir}"/>
-        <include name="com/trolltech/qt/*.java"/>
-        <include name="com/trolltech/qt/*/*.java"/>
-    <include name="com/trolltech/extensions/signalhandler/*.java"/>
-      </javac>
+        <javac memoryMaximumSize="1024m" fork="true" debug="true" target="1.5"
+            destdir="${outputDir}">
+            <src path="${outputDir}"/>
+            <src path="${sourceDir}"/>
+            <include name="com/trolltech/qt/*.java"/>
+            <include name="com/trolltech/qt/*/*.java"/>
+            <include name="com/trolltech/extensions/signalhandler/*.java"/>
+        </javac>
     </target>
 
 
     <target name="library.java.bundle" depends="library.java.compile">
         <jar destfile="${outputDir}/qtjambi-${qtjambi.version}.jar"
-             basedir="${outputDir}"
-             
includes="com/trolltech/qt/*.class,com/trolltech/qt/*/*.class,com/trolltech/extensions/signalhandler/*.class"
-             includesfile="${sourceDir}/com/trolltech/images/qt-logo.png">
+            basedir="${outputDir}"
+            
includes="com/trolltech/qt/*.class,com/trolltech/qt/*/*.class,com/trolltech/extensions/signalhandler/*.class"
+            includesfile="${sourceDir}/com/trolltech/images/qt-logo.png">
             <manifest>
                 <attribute name="Built-By" value="${user.name} - ${TODAY}"/>
             </manifest>
         </jar>
     </target>
 
-    <target name="examples.phonon"
-        depends="init"
-        if="qtjambi.phonon">
+    <target name="examples.phonon" depends="init" if="qtjambi.phonon">
         <javac destdir="${outputDir}" target="1.5" debug="true">
             <src path="${outputDir}"/>
             <src path="${sourceDir}"/>
@@ -173,9 +169,7 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </javac>
     </target>
 
-    <target name="examples.webkit"
-        depends="init"
-        if="qtjambi.webkit">
+    <target name="examples.webkit" depends="init" if="qtjambi.webkit">
         <javac destdir="${outputDir}" target="1.5" debug="true">
             <src path="${outputDir}"/>
             <src path="${sourceDir}"/>
@@ -184,9 +178,7 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </javac>
     </target>
 
-    <target name="examples.xmlpatterns"
-        depends="init"
-        if="qtjambi.xmlpatterns">
+    <target name="examples.xmlpatterns" depends="init" 
if="qtjambi.xmlpatterns">
         <javac destdir="${outputDir}" target="1.5" debug="true">
             <src path="${outputDir}"/>
             <src path="${sourceDir}"/>
@@ -196,12 +188,9 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
     </target>
 
     <target name="examples.compile"
-            depends="init, examples.phonon, examples.webkit, 
examples.xmlpatterns">
-        <javac destdir="${outputDir}"
-           debug="true"
-           fork="true"
-           memoryMaximumSize="1024m"
-           target="1.5">
+        depends="init, examples.phonon, examples.webkit, examples.xmlpatterns">
+        <javac destdir="${outputDir}" debug="true" fork="true" target="1.5"
+            memoryMaximumSize="1024m">
             <src path="${outputDir}"/>
             <src path="${sourceDir}"/>
             <include name="com/trolltech/demos/**/*.java"/>
@@ -231,10 +220,9 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
     </target>
 
 
-    <target name="examples.bundle"
-        depends="examples.compile">
-      <jar destfile="${outputDir}/qtjambi-examples-${qtjambi.version}.jar"
-             basedir="${outputDir}/">
+    <target name="examples.bundle" depends="examples.compile">
+        <jar destfile="${outputDir}/qtjambi-examples-${qtjambi.version}.jar"
+            basedir="${outputDir}/">
             <include name="com/trolltech/examples/**/*"/>
             <include name="com/trolltech/demos/**/*"/>
             <include name="com/trolltech/launcher/*"/>
@@ -246,73 +234,70 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </jar>
     </target>
 
-    <!-- 
-        ************************************************************
-        Library Compilation etc ...
-        ************************************************************
-      -->
+    <!--
+        ************************************************************
+        Library Compilation etc ...
+        ************************************************************
+    -->
 
     <condition property="qtjambi.library.makefiles.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
+                <isset property="qtjambi.force"/>
             </not>
             <uptodate targetfile="${outputDir}/Makefile">
-              <srcfiles dir="${outputDir}/cpp" includes="**/*.pri"/>
-              <srcfiles dir="${outputDir}" includes="**/qtjambi_*.pro"/>
-              <srcfiles dir="${outputDir}/juic" includes="juic.pro"/>
-              <srcfiles dir="${outputDir}/qtjambi" includes="*.pr*"/>
-              <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.pr*"/>
+                <srcfiles dir="${outputDir}/cpp" includes="**/*.pri"/>
+                <srcfiles dir="${outputDir}" includes="**/qtjambi_*.pro"/>
+                <srcfiles dir="${outputDir}/juic" includes="juic.pro"/>
+                <srcfiles dir="${outputDir}/qtjambi" includes="*.pr*"/>
+                <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.pr*"/>
             </uptodate>
         </and>
     </condition>
 
-    <condition property="qtjambi.library.cppfiles.uptodate"> 
+    <condition property="qtjambi.library.cppfiles.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
+                <isset property="qtjambi.force"/>
             </not>
             <uptodate targetfile="${outputDir}/.compile.timestamp">
-              <srcfiles dir="${outputDir}/cpp" includes="**/*.cpp"/>
-              <srcfiles dir="${outputDir}/cpp" includes="**/*.h"/>
-              <srcfiles dir="${outputDir}/qtjambi" includes="*.cpp"/>
-              <srcfiles dir="${outputDir}/qtjambi" includes="*.h"/>
-              <srcfiles dir="${outputDir}/qtjambi_core/" includes="*.cpp"/>
-              <srcfiles dir="${outputDir}/qtjambi_core/" includes="*.h"/>
-              <srcfiles dir="${outputDir}/qtjambi_gui/" includes="*.cpp"/>
-              <srcfiles dir="${outputDir}/qtjambi_gui/" includes="*.h"/>
-              <srcfiles dir="${outputDir}/qtjambi_designer/" includes="*.cpp"/>
-              <srcfiles dir="${outputDir}/qtjambi_designer/" includes="*.h"/>
-              <srcfiles dir="${outputDir}/juic" includes="*.cpp"/>
-              <srcfiles dir="${outputDir}/juic" includes="*.h"/>
-              <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.cpp"/>
-              <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.h"/>
+                <srcfiles dir="${outputDir}/cpp" includes="**/*.cpp"/>
+                <srcfiles dir="${outputDir}/cpp" includes="**/*.h"/>
+                <srcfiles dir="${outputDir}/qtjambi" includes="*.cpp"/>
+                <srcfiles dir="${outputDir}/qtjambi" includes="*.h"/>
+                <srcfiles dir="${outputDir}/qtjambi_core/" includes="*.cpp"/>
+                <srcfiles dir="${outputDir}/qtjambi_core/" includes="*.h"/>
+                <srcfiles dir="${outputDir}/qtjambi_gui/" includes="*.cpp"/>
+                <srcfiles dir="${outputDir}/qtjambi_gui/" includes="*.h"/>
+                <srcfiles dir="${outputDir}/qtjambi_designer/" 
includes="*.cpp"/>
+                <srcfiles dir="${outputDir}/qtjambi_designer/" includes="*.h"/>
+                <srcfiles dir="${outputDir}/juic" includes="*.cpp"/>
+                <srcfiles dir="${outputDir}/juic" includes="*.h"/>
+                <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.cpp"/>
+                <srcfiles dir="${outputDir}/designer-integration" 
includes="**/*.h"/>
             </uptodate>
         </and>
     </condition>
 
-    <target name="library.native.qmake"
-            depends="init"
-            description="Runs qmake on the Qt Jambi project."
-           unless="qtjambi.library.makefiles.uptodate">
-        <delete dir="${jambiLib}" />
-       <qmake recursive="true"
-               dir="${outputDir}"
-               pro="${sourceDir}/java.pro"
-               config="${qtjambi.configuration} ${qtjambi.config.jumptable}"
-               debugTools="${qtjambi.debug-tools}"/>
+    <target name="library.native.qmake" depends="init"
+        description="Runs qmake on the Qt Jambi project."
+        unless="qtjambi.library.makefiles.uptodate">
+        <delete dir="${jambiLib}"/>
+        <qmake recursive="true" dir="${outputDir}" pro="${sourceDir}/java.pro"
+            config="${qtjambi.configuration} ${qtjambi.config.jumptable}"
+            debugTools="${qtjambi.debug-tools}"/>
     </target>
 
     <target name="library.native.compile"
-            depends="init"
-            description="Compiles the C++ Qt Jambi bindings."
-           unless="qtjambi.library.cppfiles.uptodate">
-      <make dir="${outputDir}"/>
-      <touch file="${outputDir}/.compile.timestamp"/>
+        depends="init"
+        description="Compiles the C++ Qt Jambi bindings."
+        unless="qtjambi.library.cppfiles.uptodate">
+        <make dir="${outputDir}"/>
+        <touch file="${outputDir}/.compile.timestamp"/>
     </target>
 
-    <target name="library.designer.compile" 
-           depends="init">
+    <target name="library.designer.compile"
+        depends="init">
         <javac destdir="${outputDir}" target="1.5" debug="true">
             <src path="${outputDir}"/>
             <src path="${sourceDir}"/>
@@ -320,76 +305,105 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         </javac>
     </target>
 
-    <target name="library.designer.bundle" 
-           depends="library.designer.compile" 
-           unless="qtjambi.library.cppfiles.uptodate">
+    <target name="library.designer.bundle"
+        depends="library.designer.compile"
+        unless="qtjambi.library.cppfiles.uptodate">
         <jar destfile="${outputDir}/qtjambi-designer-${qtjambi.version}.jar"
-             basedir="${outputDir}">
+            basedir="${outputDir}">
             <include name="com/trolltech/tools/designer/*"/>
             <exclude name="com/trolltech/tools/designer/*.java"/>
-           <manifest>
+            <manifest>
                 <attribute name="Built-By" value="${user.name} - ${TODAY}"/>
             </manifest>
         </jar>
     </target>
 
-    <target name="library.native.bundle"
-            depends="init"
-            description="Creates a .jar file file containing native libraries."
-           unless="qtjambi.library.cppfiles.uptodate">
-
+    <target name="library.native.bundle" depends="init"
+        description="Creates a .jar file file containing native libraries."
+        unless="qtjambi.library.cppfiles.uptodate">
         <qtjambi-platform-jar 
cacheKey="${qtjambi.compiler}-${DSTAMP}-${TSTAMP}"
-                              outdir="${outputDir}/platform-output">
-
+            outdir="${outputDir}/platform-output">
             <!-- Qt Libraries... -->
-            <library name="QtCore"    type="qt" rootPath="${qtjambi.qtdir}" />
-            <library name="QtGui"     type="qt" rootPath="${qtjambi.qtdir}" />
-            <library name="QtXml"     type="qt" rootPath="${qtjambi.qtdir}" />
-            <library name="QtSql"     type="qt" rootPath="${qtjambi.qtdir}" />
-            <library name="QtSvg"     type="qt" rootPath="${qtjambi.qtdir}" 
load="yes" />
-            <library name="QtNetwork" type="qt" rootPath="${qtjambi.qtdir}" />
-            <library name="QtOpenGL"  type="qt" rootPath="${qtjambi.qtdir}" 
if="${qtjambi.opengl}"/>
-            <library name="QtWebKit"  type="qt" rootPath="${qtjambi.qtdir}" 
if="${qtjambi.webkit}"/>
-            <library name="QtXmlPatterns" type="qt" 
rootPath="${qtjambi.qtdir}" if="${qtjambi.xmlpatterns}"/>
-            <library name="phonon"    type="qt" rootPath="${qtjambi.qtdir}" 
if="${qtjambi.phonon}"/>
-            <library name="QtDBus"    type="qt" rootPath="${qtjambi.qtdir}" 
if="${qtjambi.dbus}"/>
-            <library name="phonon_ds9" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/phonon_backend" load="never" 
if="${qtjambi.phonon_ds9}" />
-            <library name="phonon_gstreamer" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/phonon_backend" load="never" 
if="${qtjambi.phonon_gstreamer}" />
-            <library name="phonon_qt7" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/phonon_backend" load="never" 
if="${qtjambi.phonon_qt7}" />
-
+            <library name="QtCore" type="qt" rootPath="${qtjambi.qtdir}"/>
+            <library name="QtGui" type="qt" rootPath="${qtjambi.qtdir}"/>
+            <library name="QtXml" type="qt" rootPath="${qtjambi.qtdir}"/>
+            <library name="QtSql" type="qt" rootPath="${qtjambi.qtdir}"/>
+            <library name="QtSvg" type="qt" rootPath="${qtjambi.qtdir}"
+                load="yes"/>
+            <library name="QtNetwork" type="qt" rootPath="${qtjambi.qtdir}"/>
+            <library name="QtOpenGL"  type="qt" rootPath="${qtjambi.qtdir}"
+                if="${qtjambi.opengl}"/>
+            <library name="QtWebKit"  type="qt" rootPath="${qtjambi.qtdir}"
+                if="${qtjambi.webkit}"/>
+            <library name="QtXmlPatterns" type="qt" rootPath="${qtjambi.qtdir}"
+                if="${qtjambi.xmlpatterns}"/>
+            <library name="phonon" type="qt" rootPath="${qtjambi.qtdir}"
+                if="${qtjambi.phonon}"/>
+            <library name="QtDBus" type="qt" rootPath="${qtjambi.qtdir}"
+                if="${qtjambi.dbus}"/>
+            <library name="phonon_ds9" type="plugin" 
rootPath="${qtjambi.qtdir}"
+                subdir="plugins/phonon_backend" load="never"
+                if="${qtjambi.phonon_ds9}"/>
+            <library name="phonon_gstreamer" type="plugin"
+                rootPath="${qtjambi.qtdir}" subdir="plugins/phonon_backend"
+                    load="never" if="${qtjambi.phonon_gstreamer}"/>
+            <library name="phonon_qt7" type="plugin"
+                rootPath="${qtjambi.qtdir}" subdir="plugins/phonon_backend"
+                load="never" if="${qtjambi.phonon_qt7}"/>
             <!-- Qt Plugins... -->
-            <library name="qjpeg" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/imageformats" load="never"/>
-            <library name="qgif" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/imageformats" load="never"/>
-            <library name="qmng" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/imageformats" load="never"/>
-            <library name="qtiff" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/imageformats" load="never"/>
-            <library name="qsvg" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/imageformats" load="never"/>
-            <library name="qsvgicon" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/iconengines" load="never"/>
-            <library name="qcncodecs" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/codecs" load="never" />
-            <library name="qjpcodecs" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/codecs" load="never" />
-            <library name="qkrcodecs" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/codecs" load="never" />
-            <library name="qtwcodecs" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/codecs" load="never" />
-            <library name="qtaccessiblewidgets" type="plugin" 
rootPath="${qtjambi.qtdir}" subdir="plugins/accessible" load="never"/>
-            <library name="qsqlite" type="plugin" rootPath="${qtjambi.qtdir}" 
subdir="plugins/sqldrivers" load="never" if="${qtjambi.sqlite}" />
-
+            <library name="qjpeg" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/imageformats" load="never"/>
+            <library name="qgif" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/imageformats" load="never"/>
+            <library name="qmng" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/imageformats" load="never"/>
+            <library name="qtiff" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/imageformats" load="never"/>
+            <library name="qsvg" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/imageformats" load="never"/>
+            <library name="qsvgicon" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/iconengines" load="never"/>
+            <library name="qcncodecs" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/codecs" load="never"/>
+            <library name="qjpcodecs" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/codecs" load="never"/>
+            <library name="qkrcodecs" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/codecs" load="never"/>
+            <library name="qtwcodecs" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/codecs" load="never"/>
+            <library name="qtaccessiblewidgets" type="plugin"
+                rootPath="${qtjambi.qtdir}" subdir="plugins/accessible"
+                load="never"/>
+            <library name="qsqlite" type="plugin" rootPath="${qtjambi.qtdir}"
+                subdir="plugins/sqldrivers" load="never"
+                if="${qtjambi.sqlite}"/>
             <!-- Qt Jambi Libraries -->
-            <library name="qtjambi"                  type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_core"    type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_gui"     type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_xml"     type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_sql"     type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_svg"     type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_network" type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_opengl"  type="qtjambi" 
rootPath="${outputDir}" />
-            <library name="com_trolltech_qt_phonon"  type="qtjambi" 
rootPath="${outputDir}" if="${qtjambi.phonon}"/>
-            <library name="com_trolltech_qt_webkit"  type="qtjambi" 
rootPath="${outputDir}" if="${qtjambi.webkit}"/>
-            <library name="com_trolltech_qt_xmlpatterns"  type="qtjambi" 
rootPath="${outputDir}" if="${qtjambi.xmlpatterns}"/>
-
-        <plugin path="plugins" />
-
+            <library name="qtjambi" type="qtjambi" rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_core" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_gui" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_xml" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_sql" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_svg" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_network" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_opengl" type="qtjambi"
+                rootPath="${outputDir}"/>
+            <library name="com_trolltech_qt_phonon" type="qtjambi"
+                rootPath="${outputDir}" if="${qtjambi.phonon}"/>
+            <library name="com_trolltech_qt_webkit"  type="qtjambi"
+                rootPath="${outputDir}" if="${qtjambi.webkit}"/>
+            <library name="com_trolltech_qt_xmlpatterns" type="qtjambi"
+                rootPath="${outputDir}" if="${qtjambi.xmlpatterns}"/>
+            <plugin path="plugins"/>
         </qtjambi-platform-jar>
 
         <jar 
destfile="${outputDir}/qtjambi-${qtjambi.osname}-${qtjambi.compiler}-${qtjambi.version}.jar">
-            <fileset dir="${outputDir}/platform-output" />
+            <fileset dir="${outputDir}/platform-output"/>
             <manifest>
                 <attribute name="Built-By" value="${user.name} - ${TODAY}"/>
             </manifest>
@@ -398,322 +412,306 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
         <delete dir="${outputDir}/platform-output"/>
     </target>
 
-
-
-    <!-- 
-        ************************************************************
-        Building and running the Generator...
-        ************************************************************
-      -->
+    <!--
+        ************************************************************
+        Building and running the Generator...
+        ************************************************************
+    -->
     <condition property="qtjambi.generator_pro.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>    
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/Makefile">
-              <srcfiles dir="${sourceDir}/generator" includes="generator.pr*"/>
-              <srcfiles dir="${sourceDir}/generator/parser" 
includes="rxx.pr*"/>
-              <srcfiles dir="${sourceDir}/generator/parser/rpp" 
includes="rpp.pri"/>
+                <srcfiles dir="${sourceDir}/generator" 
includes="generator.pr*"/>
+                <srcfiles dir="${sourceDir}/generator/parser" 
includes="rxx.pr*"/>
+                <srcfiles dir="${sourceDir}/generator/parser/rpp" 
includes="rpp.pri"/>
             </uptodate>
         </and>
     </condition>
-    
-    <target name="generator.qmake"
-            depends="init, generator.xmlmerge"
-            description="Runs qmake on the generator project." 
-           unless="qtjambi.generator_pro.uptodate">
-      <mkdir dir="${outputDir}/generator"/>
-      <qmake config="${qtjambi.configuration}"
-             dir="${outputDir}/generator"
-             pro="${sourceDir}/generator/generator.pro"
-             debugTools="${qtjambi.debug-tools}"/>
+
+    <target name="generator.qmake" depends="init, generator.xmlmerge"
+        description="Runs qmake on the generator project."
+        unless="qtjambi.generator_pro.uptodate">
+        <mkdir dir="${outputDir}/generator"/>
+        <qmake config="${qtjambi.configuration}" dir="${outputDir}/generator"
+            pro="${sourceDir}/generator/generator.pro"
+            debugTools="${qtjambi.debug-tools}"/>
     </target>
 
     <condition property="qtjambi.generator_compile.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
+                <isset property="qtjambi.force"/>
             </not>
             <uptodate targetfile="${outputDir}/generator/.compile.timestamp">
-              <srcfiles dir="${sourceDir}/generator" includes="**/*.cpp"/>
-              <srcfiles dir="${sourceDir}/generator" includes="**/*.h"/>
-              <srcfiles dir="${sourceDir}/generator" includes="Makefile"/>
-              <srcfiles dir="${sourceDir}/generator" includes="*.qrc"/>
-              <srcfiles dir="${sourceDir}/generator" includes="*.txt"/>
-              <srcfiles dir="${sourceDir}/generator" includes="*.xml"/>
+                <srcfiles dir="${sourceDir}/generator" includes="**/*.cpp"/>
+                <srcfiles dir="${sourceDir}/generator" includes="**/*.h"/>
+                <srcfiles dir="${sourceDir}/generator" includes="Makefile"/>
+                <srcfiles dir="${sourceDir}/generator" includes="*.qrc"/>
+                <srcfiles dir="${sourceDir}/generator" includes="*.txt"/>
+                <srcfiles dir="${sourceDir}/generator" includes="*.xml"/>
             </uptodate>
         </and>
     </condition>
-    
-    <target name="generator.compile"
-            depends="init, generator.qmake"
-            description="Compiles the Qt Jambi generator."
-           unless="qtjambi.generator_compile.uptodate">
-      <make dir="${outputDir}/generator" />
-      <touch file="${outputDir}/generator/.compile.timestamp"/>
-    </target>
-
-    <target name="generator.run"
-            depends="init, generator.compile"
-            description="Runs the Qt Jambi generator on the Qt sources, using 
the Qt version found at the QTDIR variable."
-           unless="qtjambi.generator_compile.uptodate">
-      <generator dir="${outputDir}/generator"
-                   outputDirectory="${outputDir}"
-                   typesystem="${sourceDir}/generator/build_all.txt"
-                   header="${sourceDir}/generator/qtjambi_masterinclude.h"
-           options="${qtjambi.generator.jumptable}"/>
-      <touch file="${outputDir}/generator/.run.timestamp"/>
-    </target>
-
-
-
-    <!-- 
-        ************************************************************
-        XML Merging for the generator... 
-        ************************************************************
-      -->
-    <condition property="qtjambi.typesystem_core.uptodate"> 
+
+    <target name="generator.compile" depends="init, generator.qmake"
+        description="Compiles the Qt Jambi generator."
+        unless="qtjambi.generator_compile.uptodate">
+        <make dir="${outputDir}/generator"/>
+        <touch file="${outputDir}/generator/.compile.timestamp"/>
+    </target>
+
+    <target name="generator.run" depends="init, generator.compile"
+        description="Runs the Qt Jambi generator on the Qt sources, using the 
Qt version found at the QTDIR variable."
+        unless="qtjambi.generator_compile.uptodate">
+        <generator dir="${outputDir}/generator" outputDirectory="${outputDir}"
+            typesystem="${sourceDir}/generator/build_all.txt"
+            header="${sourceDir}/generator/qtjambi_masterinclude.h"
+            options="${qtjambi.generator.jumptable}"/>
+        <touch file="${outputDir}/generator/.run.timestamp"/>
+    </target>
+
+    <!--
+        ************************************************************
+        XML Merging for the generator...
+        ************************************************************
+    -->
+    <condition property="qtjambi.typesystem_core.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/typesystem_core.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_core-*.*"/>
+                <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_core-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.core" 
unless="qtjambi.typesystem_core.uptodate">
-        <xslt in="${sourceDir}/generator/typesystem_core-common.xml"
-              out="${outputDir}/generator/typesystem_core.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_core-java.xml"/>
+        <xslt in="${sourceDir}/generator/typesystem_core-common.xml" 
force="yes"
+            out="${outputDir}/generator/typesystem_core.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_core-java.xml"/>
         </xslt>
     </target>
 
-    
-    <condition property="qtjambi.typesystem_gui.uptodate"> 
+    <condition property="qtjambi.typesystem_gui.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/typesystem_gui.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_gui-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_gui-*.*"/>
             </uptodate>
         </and>
     </condition>
 
     <target name="generator.xmlmerge.gui" 
unless="qtjambi.typesystem_gui.uptodate">
-        <xslt in="${sourceDir}/generator/typesystem_gui-common.xml"
-              out="${outputDir}/generator/typesystem_gui.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_gui-java.xml"/>
+        <xslt in="${sourceDir}/generator/typesystem_gui-common.xml" force="yes"
+            out="${outputDir}/generator/typesystem_gui.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_gui-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_xml.uptodate"> 
+    <condition property="qtjambi.typesystem_xml.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/typesystem_xml.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_xml-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_xml-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.xml" 
unless="qtjambi.typesystem_xml.uptodate">
-        <xslt in="${sourceDir}/generator/typesystem_xml-common.xml"
-              out="${outputDir}/generator/typesystem_xml.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_xml-java.xml"/>
+        <xslt in="${sourceDir}/generator/typesystem_xml-common.xml" force="yes"
+            out="${outputDir}/generator/typesystem_xml.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_xml-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_network.uptodate"> 
+    <condition property="qtjambi.typesystem_network.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate 
targetfile="${outputDir}/generator/typesystem_network.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_network-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_network-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.network" 
unless="qtjambi.typesystem_network.uptodate">
         <xslt in="${sourceDir}/generator/typesystem_network-common.xml"
-              out="${outputDir}/generator/typesystem_network.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_network-java.xml"/>
+            force="yes"
+            out="${outputDir}/generator/typesystem_network.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_network-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_opengl.uptodate"> 
+    <condition property="qtjambi.typesystem_opengl.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate 
targetfile="${outputDir}/generator/typesystem_opengl.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_opengl-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_opengl-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.opengl" 
unless="qtjambi.typesystem_opengl.uptodate">
-        <xslt in="generator/typesystem_opengl-common.xml"
+        <xslt in="generator/typesystem_opengl-common.xml" force="yes"
               out="${outputDir}/generator/typesystem_opengl.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_opengl-java.xml"/>
+              style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_opengl-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_sql.uptodate"> 
+    <condition property="qtjambi.typesystem_sql.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/typesystem_sql.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_sql-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_sql-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.sql" 
unless="qtjambi.typesystem_sql.uptodate">
-        <xslt in="${sourceDir}/generator/typesystem_sql-common.xml"
+        <xslt in="${sourceDir}/generator/typesystem_sql-common.xml" force="yes"
               out="${outputDir}/generator/typesystem_sql.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_sql-java.xml"/>
+              style="${sourceDir}/generator/merge.xsl">
+              <param name="source" expression="typesystem_sql-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_svg.uptodate"> 
+    <condition property="qtjambi.typesystem_svg.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate targetfile="${outputDir}/generator/typesystem_svg.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_svg-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_svg-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.svg" 
unless="qtjambi.typesystem_svg.uptodate">
-        <xslt in="${sourceDir}/generator/typesystem_svg-common.xml"
+        <xslt in="${sourceDir}/generator/typesystem_svg-common.xml" force="yes"
               out="${outputDir}/generator/typesystem_svg.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_svg-java.xml"/>
+              style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_svg-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_webkit.uptodate"> 
+    <condition property="qtjambi.typesystem_webkit.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate 
targetfile="${outputDir}/generator/typesystem_webkit.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_webkit-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_webkit-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.webkit" 
unless="qtjambi.typesystem_webkit.uptodate">
          <xslt in="${sourceDir}/generator/typesystem_webkit-common.xml"
-              out="${outputDir}/generator/typesystem_webkit.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_webkit-java.xml"/>
+             force="yes"
+            out="${outputDir}/generator/typesystem_webkit.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_webkit-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_phonon.uptodate"> 
+    <condition property="qtjambi.typesystem_phonon.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
+                <isset property="qtjambi.force"/>
+            </not>
             <uptodate 
targetfile="${outputDir}/generator/typesystem_phonon.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_phonon-*.*"/>
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_phonon-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.phonon" 
unless="qtjambi.typesystem_phonon.uptodate">
         <xslt in="${sourceDir}/generator/typesystem_phonon-common.xml"
-              out="${outputDir}/generator/typesystem_phonon.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_phonon-java.xml"/>
+            force="yes"
+            out="${outputDir}/generator/typesystem_phonon.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_phonon-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_xmlpatterns.uptodate"> 
+    <condition property="qtjambi.typesystem_xmlpatterns.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
-            <uptodate 
targetfile="${outputDir}/generator/typesystem_xmlpatterns.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_xmlpatterns-*.*"/>
+                <isset property="qtjambi.force"/>
+            </not>
+            <uptodate
+                targetfile="${outputDir}/generator/typesystem_xmlpatterns.xml">
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_xmlpatterns-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
-    <target name="generator.xmlmerge.xmlpatterns" 
unless="qtjambi.typesystem_xmlpatterns.uptodate">
+
+    <target name="generator.xmlmerge.xmlpatterns"
+        unless="qtjambi.typesystem_xmlpatterns.uptodate">
         <xslt in="${sourceDir}/generator/typesystem_xmlpatterns-common.xml"
-              out="${outputDir}/generator/typesystem_xmlpatterns.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_xmlpatterns-java.xml"/>
+            force="yes"
+            out="${outputDir}/generator/typesystem_xmlpatterns.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_xmlpatterns-java.xml"/>
         </xslt>
     </target>
 
-    <condition property="qtjambi.typesystem_designer.uptodate"> 
+    <condition property="qtjambi.typesystem_designer.uptodate">
         <and>
             <not>
-                <isset property="qtjambi.force" />
-            </not>        
-            <uptodate 
targetfile="${outputDir}/generator/typesystem_designer.xml">
-              <srcfiles dir="${sourceDir}/generator" 
includes="typesystem_designer-*.*"/>
+                <isset property="qtjambi.force"/>
+            </not>
+            <uptodate
+                targetfile="${outputDir}/generator/typesystem_designer.xml">
+                <srcfiles dir="${sourceDir}/generator"
+                    includes="typesystem_designer-*.*"/>
             </uptodate>
         </and>
     </condition>
-    
+
     <target name="generator.xmlmerge.designer" 
unless="qtjambi.typesystem_designer.uptodate">
         <xslt in="${sourceDir}/generator/typesystem_designer-common.xml"
-              out="${outputDir}/generator/typesystem_designer.xml"
-              style="${sourceDir}/generator/merge.xsl"
-              force="yes">
-            <param name="source"
-                   expression="typesystem_designer-java.xml"/>
+            force="yes"
+            out="${outputDir}/generator/typesystem_designer.xml"
+            style="${sourceDir}/generator/merge.xsl">
+            <param name="source" expression="typesystem_designer-java.xml"/>
         </xslt>
     </target>
 
 
     <target name="generator.xmlmerge"
-           depends="generator.xmlmerge.core, generator.xmlmerge.gui, 
generator.xmlmerge.network, generator.xmlmerge.svg, generator.xmlmerge.xml, 
generator.xmlmerge.xmlpatterns, generator.xmlmerge.opengl, 
generator.xmlmerge.sql, generator.xmlmerge.designer, generator.xmlmerge.webkit, 
generator.xmlmerge.phonon"
-           description="Merges the XML files used by the Qt Jambi generator.">
-    </target>
+        description="Merges the XML files used by the Qt Jambi generator."
+        depends="generator.xmlmerge.core, generator.xmlmerge.gui, 
generator.xmlmerge.network, generator.xmlmerge.svg, generator.xmlmerge.xml, 
generator.xmlmerge.xmlpatterns, generator.xmlmerge.opengl, 
generator.xmlmerge.sql, generator.xmlmerge.designer, generator.xmlmerge.webkit, 
generator.xmlmerge.phonon"/>
 
-    <target name="init"
-        depends="init.ant, init.taskdef"
+    <target name="init" depends="init.ant, init.taskdef"
         description="Initializes the Qt Jambi build environment." >
-      <qtjambi-initialize verbose="true" configuration="${qtjambi.config}" />
+        <qtjambi-initialize verbose="true" configuration="${qtjambi.config}"/>
     </target>
 
     <target name="generator"
@@ -742,5 +740,5 @@ 
http://doc.trolltech.com/qtjambi/com/trolltech/qt/qtjambi-installation.html
 
     <target name="all"
             description="Generates, builds and bundles the Qt Jambi libraries."
-            depends="init, generator, library, examples" />
+            depends="init, generator, library, examples"/>
 </project>
-- 
1.6.5.rc1

_______________________________________________
Qt-jambi-interest mailing list
[email protected]
http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest

Reply via email to