--- a/symbian4/app/location/package_definition.xml	Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Wed May 26 17:30:43 2010 +0100
@@ -1,100 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
-        <collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
-          <component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-            <unit bldFile="/sf/app/location/location_plat" proFile="location_plat.pro"/>
-          </component>
-        </collection>
-        <collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
-          <!--collection is really a component. Should move down a directory -->
-          <component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-            <unit bldFile="/sf/app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
-          </component>
-        </collection>
-        <collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
-          <!--collection is really a component. Should move down a directory -->
-          <component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="location" name="Location Apps" levels="ui events loc api">
+  <collection id="location_plat" name="Location Apps Platform Interfaces" level="api">
+   <component id="location_picker_service_api" name="Location Picker Service API" introduced="^4" class="api" filter="s60">
+    <unit bldFile="location_plat" qt:proFile="location_plat.pro"/>
+   </component>
+  </collection>
+  <collection id="locationpickerservice" name="Location Picker Service" level="loc">
+	<!--collection is really a component. Should move down a directory -->
+   <component id="locationpickerservice_build" filter="s60" name="Location Picker Service Build" introduced="^4">
+    <unit bldFile="locationpickerservice" qt:proFile="locationpickerservice.pro"/>
+   </component>
+  </collection>
+  <collection id="locationdataharvester" name="Location Data Harvester" level="events">
+	<!--collection is really a component. Should move down a directory -->
+     <component id="locationdataharvester_build" name="Location Data Harvester Build" filter="s60" introduced="^4">
+      <unit bldFile="locationdataharvester" qt:proFile="locationdataharvester.pro"/>
+     </component>
+  </collection>
+ </package>
 </SystemDefinition>