diff -r b3cd97947a8a -r a3f2b0422c8b tip_pbc/mw/wirelessacc/package_definition.xml
--- a/tip_pbc/mw/wirelessacc/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/wirelessacc/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,57 +50,57 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="wirelessacc" level="specific" levels="framework generic ui" long-name="Wireless Access">
+   <block name="wirelessacc" level="specific" long-name="Wireless Access" levels="framework generic ui">
 <collection name="hsfw_plat" long-name="HotSpot Framework Platform Interfaces" level="ui">
-<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" purpose="optional" class="api">
+<component name="hotspot_framework_client_api" long-name="HotSpot Framework Client API" filter="s60" class="api">
 <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_api/group"/>
 </component>
-<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" purpose="optional" class="api">
+<component name="internet_connectivity_test_service_api" long-name="Internet Connectivity Test Service API" filter="s60" class="api">
 <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_api/group"/>
 </component>
-<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" purpose="optional" class="api">
+<component name="internet_connectivity_test_service_settings_api" long-name="Internet Connectivity Test Service Settings API" filter="s60" class="api">
 <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/internet_connectivity_test_service_settings_api/group"/>
 </component>
-<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" purpose="optional" class="api">
+<component name="hotspot_framework_client_plugin_api" long-name="HotSpot Framework Client Plugin API" filter="s60" class="api">
 <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/hotspot_framework_client_plugin_api/group"/>
 </component>
 </collection>
 <collection name="hotspotfw" long-name="HotSpot Framework" level="framework">
 <!-- collection is really a component. Needs to move down a dir -->
-<component name="hotspotfw_build" long-name="HotSpot Framework Build" filter="s60" purpose="optional">
+<component name="hotspotfw_build" filter="s60" long-name="HotSpot Framework Build">
 <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
 </component>
 </collection>
 <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-<component name="wlanqtutilities" long-name="WLAN Qt Utilities" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanqtutilities" proFile="wlanqtutilities.pro" qmakeArgs="-r"/>
+<component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanqtutilities" proFile="wlanqtutilities.pro"/>
 </component>
-<component name="eapwizard" long-name="EAP Wizard" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/eapwizard" proFile="eapwizard.pro" qmakeArgs="-r"/>
+<component name="eapwizard " filter="s60" long-name="EAP Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/eapwizard" proFile="eapwizard.pro"/>
 </component>
-<component name="wpswizard" long-name="WPS Wizard" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wpswizard" proFile="wpswizard.pro" qmakeArgs="-r"/>
+<component name="wpswizard " filter="s60" long-name="WPS Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wpswizard" proFile="wpswizard.pro"/>
 </component>
-<component name="wlanwizard" long-name="WLAN Wizard" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanwizard" proFile="wlanwizard.pro" qmakeArgs="-r"/>
+<component name="wlanwizard " filter="s60" long-name="WLAN Wizard" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanwizard" proFile="wlanwizard.pro"/>
 </component>
-<component name="wlansniffer" long-name="WLAN Sniffer" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer" proFile="wlansniffer.pro" qmakeArgs="-r"/>
+<component name="wlansniffer" filter="s60" long-name="WLAN Sniffer">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer" proFile="wlansniffer.pro"/>
 </component>
-<component name="wlanentryplugin" long-name="WLAN Entry Plugin" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanentryplugin" proFile="wlanentryplugin.pro" qmakeArgs="-r"/>
+<component name="wlanentryplugin" filter="s60" long-name="WLAN Entry Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanentryplugin" proFile="wlanentryplugin.pro"/>
 </component>
-<component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin" proFile="wlanindicatorplugin.pro" qmakeArgs="-r"/>
+<component name="wlanindicatorplugin" filter="s60" long-name="WLAN Indicator Plugin" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin" proFile="wlanindicatorplugin.pro"/>
 </component>
-<component name="cpwlansettingsplugin" long-name="WLAN Settings Control Panel Plugin" introduced="^4" filter="s60" purpose="optional" plugin="Y">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/cpwlansettingsplugin" proFile="cpwlansettingsplugin.pro" qmakeArgs="-r"/>
+<component name="cpwlansettingsplugin" filter="s60" long-name="WLAN Settings Control Panel Plugin" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/cpwlansettingsplugin" proFile="cpwlansettingsplugin.pro"/>
 </component>
-<component name="wlanlogin" long-name="WLAN Login" introduced="^4" filter="s60" purpose="optional">
-<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanlogin" proFile="wlanlogin.pro" qmakeArgs="-r"/>
+<component name="wlanlogin" filter="s60" long-name="WLAN Login" introduced="^4">
+<unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanlogin" proFile="wlanlogin.pro"/>
 </component>
 </collection>
 </block>