--- a/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro	Wed Jun 23 18:14:55 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro	Tue Jul 06 14:18:35 2010 +0300
@@ -1,22 +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:
-# 	Common UI implementation for WPA/WPA2 ,802.1x and WPA2 only security modes
-#
-# %version: tr1cfwln#15 %
-#
+#   Common UI implementation for WPA/WPA2, 802.1x and 
+#   WPA2 WLAN security modes
 
+# %version: tr1cfwln#17 %
 
 TEMPLATE = lib
 TARGET = cpwpacmnui
@@ -25,47 +24,45 @@
 DEPENDPATH += 
 
 INCLUDEPATH += \
-	$$MW_LAYER_SYSTEMINCLUDE \
-    $$OS_LAYER_SYSTEMINCLUDE \
     ../inc
     
 CONFIG += hb
 
 LIBS += \
-	-lcpframework \
+    -lcpframework \
     -leapqtplugininfo \
     -leapqtconfiginterface \
     -lconnection_settings_shim
     
-MOC_DIR = _moc
-RCC_DIR = _rcc
-OBJECTS_DIR = _obj
+MOC_DIR     = _build
+RCC_DIR     = _build
+OBJECTS_DIR = _build
 
 # Input
 HEADERS += \
-	traces/OstTraceDefinitions.h \
-	inc/cpwpacmnui_p.h \
-	inc/wpakeyvalidator.h \
-	inc/cpwpacmneapui.h \
+    traces/OstTraceDefinitions.h \
+    inc/cpwpacmnui_p.h \
+    inc/wpakeyvalidator.h \
+    inc/cpwpacmneapui.h \
     ../inc/cpwpacmnui_global.h \
     ../inc/cpwpacmnui.h
-	
+  
 SOURCES += \ 
-	src/cpwpacmnui.cpp \
-	src/cpwpacmnui_p.cpp \
-	src/wpakeyvalidator.cpp \
-	src/cpwpacmneapui.cpp
+    src/cpwpacmnui.cpp \
+    src/cpwpacmnui_p.cpp \
+    src/wpakeyvalidator.cpp \
+    src/cpwpacmneapui.cpp
 
 defFilePath = ..
 
 symbian:
 { 
-	TARGET.CAPABILITY = CAP_GENERAL_DLL
+    TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.UID3 = 0x2002DC74
     
     BLD_INF_RULES.prj_exports += \ 
-    	"./rom/cpwpacmnui.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpacmnui.iby)"
+      "./rom/cpwpacmnui.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpacmnui.iby)"
 }
 
 symbian: