# HG changeset patch
# User hgs
# Date 1282559771 -10800
# Node ID 22d80358905b5323514da97068ea590f1734cd33
# Parent  c98682f98478989b6eab4ccd24ab3c73d9904d6d
201033

diff -r c98682f98478 -r 22d80358905b package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Mon Aug 23 13:36:11 2010 +0300
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0"  xmlns:qt="http://www.nokia.com/qt">
+ <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="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="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="eap_qt_configuration_api" name="EAP Qt Configuration API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="accesssec_plat" qt:proFile="accesssec_plat.pro"/>
+   </component>
+  </collection>
+  <collection id="securitysettings" name="WLAN Security Settings" level="specific">
+   <component id="accesssec_qtconfigutils" filter="s60" name="Access Security Config Utils" introduced="^4">
+    <unit bldFile="securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro"/>
+   </component>
+   <component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" class="plugin" introduced="^4">
+    <unit bldFile="securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro"/>
+   </component>
+   <component id="cpeapuiplugins" filter="s60" name="Control Panel EAP UI Pugins" class="plugin"  introduced="^4">
+    <unit bldFile="securitysettings/cpeapuiplugins" qt:proFile="cpeapuiplugins.pro"/>
+   </component>
+   <component id="eapqtdialogs" filter="s60" name="EAP Qt Dialogs" introduced="^4">
+    <unit bldFile="securitysettings/eapqtdialogs" qt:proFile="eapqtdialogs.pro"/>
+   </component>
+  </collection>
+  <collection id="eapol" name="EAPOL" level="framework">
+   <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
+    <unit bldFile="eapol/group"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
diff -r c98682f98478 -r 22d80358905b package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Mon Aug 23 13:36:11 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/eapqtdialogs.pro
--- a/securitysettings/eapqtdialogs/eapqtdialogs.pro	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/eapqtdialogs.pro	Mon Aug 23 13:36:11 2010 +0300
@@ -14,7 +14,7 @@
 # Description: EAP Dialog build file
 #
 #
-# %version: 12 %
+# %version: 13 %
 #
 
 TEMPLATE = lib
@@ -26,6 +26,12 @@
 DEPENDPATH += .
 DESTDIR = $${HB_BUILD_DIR}/plugins/devicedialogs
 
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
 # directories for generated files
 MOC_DIR     = _build
 RCC_DIR     = _build
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapdialogplugin.cpp
--- a/securitysettings/eapqtdialogs/src/eapdialogplugin.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapdialogplugin.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 9 %
+* %version: 10 %
 */
 
 // System includes
@@ -39,6 +39,7 @@
 #include "eapfastprovnotsuccessnotedialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapdialogpluginTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastcreatemasterkeyquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 5 %
+* %version: 6 %
 */
 
 // System includes
@@ -33,6 +33,7 @@
 #include "eapfastcreatemasterkeyquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastcreatemasterkeyquerydialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastinstallpacquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 4 %
+* %version: 5 %
 */
 
 // System includes
@@ -28,6 +28,7 @@
 #include "eapfastinstallpacquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastinstallpacquerydialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastpacfilepwquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 4 %
+* %version: 5 %
 */
 
 // System includes
@@ -28,6 +28,7 @@
 #include "eapfastpacfilepwquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastpacfilepwquerydialogTraces.h"
 #endif
 
 
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastpacstorepwquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 6 %
+* %version: 7 %
 */
 
 // System includes
@@ -34,6 +34,7 @@
 #include "eapfastpacstorepwquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastpacstorepwquerydialogTraces.h"
 #endif
 
 
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastprovnotsuccessnotedialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 4 %
+* %version: 5 %
 */
 
 // System includes
@@ -27,6 +27,7 @@
 #include "eapfastprovnotsuccessnotedialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastprovnotsuccessnotedialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapfastprovwaitnotedialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 3 %
+* %version: 4 %
 */
 
 // System includes
@@ -26,6 +26,7 @@
 #include "eapfastprovwaitnotedialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapfastprovwaitnotedialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapmschapv2newpwddialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 /*
-* %version: 5 %
+* %version: 6 %
 */
 
 // System includes
@@ -34,6 +34,7 @@
 #include "eapmschapv2newpwddialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapmschapv2newpwddialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapmschapv2oldpwddialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 /*
-* %version: 5 %
+* %version: 6 %
 */
 
 // System includes
@@ -32,6 +32,7 @@
 #include "eapmschapv2oldpwddialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapmschapv2oldpwddialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapmschapv2pwdexpirednotedialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 3 %
+* %version: 4 %
 */
 
 // System includes
@@ -27,6 +27,7 @@
 #include "eapmschapv2pwdexpirednotedialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapmschapv2pwdexpirednotedialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eappasswordquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 5 %
+* %version: 6 %
 */
 
 // System includes
@@ -34,6 +34,7 @@
 #include "eappasswordquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eappasswordquerydialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapquerydialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapquerydialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapquerydialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 3 %
+* %version: 4 %
 */
 
 // System includes
@@ -29,6 +29,7 @@
 #include "eapquerydialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
+#include "eapquerydialogTraces.h"
 #endif
 
 /*!
diff -r c98682f98478 -r 22d80358905b securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp
--- a/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp	Fri Jul 09 10:14:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp	Mon Aug 23 13:36:11 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 /*
- * %version: 5 %
+ * %version: 6 %
  */
 
 // System includes
@@ -34,7 +34,7 @@
 #include "eapusernamepwddialog.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
-
+#include "eapusernamepwddialogTraces.h"
 #endif
 
 /*!