--- a/symbian4/mw/accesssec/package_definition.xml	Fri Jun 11 14:36:53 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Fri Jun 11 14:50:37 2010 +0100
@@ -2,79 +2,18 @@
 <SystemDefinition schema="3.0.0">
  <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
   <collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
-   <component id="wapi_security_settings_ui_api" name="WAPI Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wapi_security_settings_ui_api/wapi_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wapi_security_settings_ui_api/group"/>
-   </component>
-   <component id="wep_security_settings_ui_api" name="WEP Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wep_security_settings_ui_api/group"/>
-   </component>
-   <component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-   </component>
-   <component id="wlan_eap_settings_ui_api" name="WLAN EAP Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wlan_eap_settings_ui_api/wlan_eap_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wlan_eap_settings_ui_api/group"/>
-   </component>
-   <component id="wpa_security_settings_ui_api" name="WPA Security Settings UI API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wpa_security_settings_ui_api/wpa_security_settings_ui_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wpa_security_settings_ui_api/group"/>
-   </component>
    <component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
     <meta rel="Api" href="accesssec_plat/eap_vpn_api/eap_vpn_api.metaxml"/>
     <unit bldFile="accesssec_plat/eap_vpn_api/group"/>
    </component>
-   <component id="eapsim_db_api" name="EAP-SIM DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapsim_db_api/eapsim_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapsim_db_api/group"/>
-   </component>
    <component id="eap_type_api" name="EAP Type API" class="api" filter="s60">
     <meta rel="Api" href="accesssec_plat/eap_type_api/eap_type_api.metaxml"/>
     <unit bldFile="accesssec_plat/eap_type_api/group"/>
    </component>
-   <component id="eaptlspeap_db_api" name="EAP-TLS-PEAP DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eaptlspeap_db_api/eaptlspeap_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eaptlspeap_db_api/group"/>
-   </component>
-   <component id="eapleap_db_api" name="LEAP DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapleap_db_api/eapleap_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapleap_db_api/group"/>
-   </component>
-   <component id="eapgtc_db_api" name="EAP-GTC DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapgtc_db_api/eapgtc_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapgtc_db_api/group"/>
-   </component>
-   <component id="eapmschapv2_db_api" name="EAP-MSCHAPV2 DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapmschapv2_db_api/eapmschapv2_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapmschapv2_db_api/group"/>
-   </component>
-   <component id="eapaka_db_api" name="EAP-AKA DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/eapaka_db_api/eapaka_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/eapaka_db_api/group"/>
-   </component>
-   <component id="wapi_db_api" name="WAPI DB API" class="api" filter="s60">
-    <meta rel="Api" href="accesssec_plat/wapi_db_api/wapi_db_api.metaxml"/>
-    <unit bldFile="accesssec_plat/wapi_db_api/group"/>
-   </component>
   </collection>
-  <collection id="wlansecuritysettings" name="WLAN Security Settings" level="specific">
-   <component id="wapisecuritysettingsui" filter="s60" name="WAPI Security Settings UI" introduced="9.1">
-    <!-- the directory for this needs to be moved up to the right level -->
-    <unit bldFile="wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-   </component>
-   <component id="wepsecuritysettingsui" filter="s60" name="WEP Security Settings UI" introduced="9.1">
-    <unit bldFile="wlansecuritysettings/wepsecuritysettingsui/group"/>
-   </component>
-   <component id="wifiprotectedsetup" filter="s60" name="WIFI Protected Setup" introduced="^1">
-    <unit bldFile="wlansecuritysettings/wifiprotectedsetup/group"/>
-   </component>
-   <component id="wlaneapsettingsui" filter="s60" name="WLAN EAP Settings UI" introduced="9.3">
-    <unit bldFile="wlansecuritysettings/wlaneapsettingsui/group"/>
-   </component>
-   <component id="wpasecuritysettingsui" filter="s60" name="WPA Security Settings UI" introduced="9.1">
-    <unit bldFile="wlansecuritysettings/wpasecuritysettingsui/group"/>
+  <collection id="securitysettings" name="Security Settings QT" level="generic">
+   <component id="securitysettings_build" name="Security Settings Build"  introduced="^4">
+    <unit bldFile="securitysettings" qt:qmakeArgs="-r" qt:proFile="securitysettings.pro"/>
    </component>
   </collection>
   <collection id="eapol" name="EAPOL" level="framework">