--- a/symbian4/mw/qt/package_definition.xml	Fri Jul 09 14:26:21 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Tue Jul 13 16:47:42 2010 +0100
@@ -10,7 +10,7 @@
     </collection>
     <collection id="qt_info" name="Qt Info" level="mw">
             <component id="qt_build" name="Qt Build" introduced="^2">
-  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
@@ -18,7 +18,7 @@
 			  <meta rel="testbuild">
 			   <group name="qtdemos"/>
 			  </meta>
-                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qtexamples" name="Qt Examples" level="app">
@@ -26,7 +26,7 @@
 			   <group name="qtdemos"/>
 			  </meta>
             <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="test,qtexamples,build_as_app">
-                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
     <collection id="qt_tests" name="Qt Tests" level="app">
@@ -34,13 +34,13 @@
 				  <meta rel="qttestsauto">
 				   <group name="qtdemos"/>
 				  </meta>
-                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:qmakeArgs="-r"/>
             </component>
             <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test,build_as_app">
 				  <meta rel="testbuild">
 				   <group name="qttestsbenchmarks"/>
 				  </meta>
-                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
             </component>
     </collection>
   </package>