--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Jun 11 16:05:06 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Jun 11 16:34:46 2010 +0100
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^3">
 <layer id="adaptation" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
@@ -6415,25 +6416,25 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
 <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qtexamples" name="Qt Examples" level="app">
 <component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qt_tests" name="Qt Tests" level="app">
 <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+<unit bldFile="/mw/qt/tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
 </component>
 <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+<unit bldFile="/mw/qt/tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 </package>
@@ -10991,14 +10992,14 @@
 <!-- consider collapsing into a single component -->
 <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
+<not-defined condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
 </component>
 <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
+<not-defined condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!--<unit bldFile="filebrowser/fileopclient/group"/>-->