--- a/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro	Thu Jun 10 16:12:28 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro	Thu Jun 24 11:23:08 2010 +0300
@@ -1,21 +1,21 @@
-# 
+#
 # Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
 # Initial Contributors:
-# 	Nokia Corporation - initial contribution.
+# Nokia Corporation - initial contribution.
 #
 # Contributors:
 #
 # Description:
-#	Control Panel UI for WPA2 only security mode
-#
-# %version: 14 %
-#
+#   Control Panel plugin for WPA2 WLAN security mode
+
+# %version: tr1cfwln#16 %
+
 
 TEMPLATE = lib
 TARGET = cpwpa2ui
@@ -23,34 +23,33 @@
 DEPENDPATH += 
 
 INCLUDEPATH += \
-	$$MW_LAYER_SYSTEMINCLUDE \
-    $$OS_LAYER_SYSTEMINCLUDE \
     ../inc
     
 CONFIG += \
-	hb \
+    hb \
     plugin
     
 LIBS += \ 
-	-lcpframework \    
+    -lcpframework \    
     -lcpwpacmnui \
     -lconnection_settings_shim \
     -leapqtconfiginterface
     
-MOC_DIR = _moc
-RCC_DIR = _rcc
-OBJECTS_DIR = _objects
+MOC_DIR     = _build
+RCC_DIR     = _build
+OBJECTS_DIR = _build
 
 # Input
 HEADERS += \ 
-	traces/OstTraceDefinitions.h \
+    traces/OstTraceDefinitions.h \
     inc/cpwpa2ui.h
     
-SOURCES += src/cpwpa2ui.cpp
+SOURCES += \
+    src/cpwpa2ui.cpp
 
 symbian: 
 { 
-	TARGET.CAPABILITY = CAP_GENERAL_DLL
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.UID3 = 0x2002DC73
 
@@ -60,7 +59,7 @@
     for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
 
     BLD_INF_RULES.prj_exports += \ 
-    	"rom/cpwpa2ui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpa2ui.iby)"
+      "rom/cpwpa2ui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpa2ui.iby)"
 }
 
 symbian: