diff -r e03a3db4489e -r 9abfd4f00d37 securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro
--- a/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro	Thu May 13 22:51:27 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpacmnui/cpwpacmnui.pro	Mon May 24 20:32:47 2010 +0300
@@ -1,53 +1,74 @@
+# 
 # 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"
 # 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:
-# %version: 10 %
+# 	Common UI implementation for WPA/WPA2 ,802.1x and WPA2 only security modes
+#
+# %version: tr1cfwln#15 %
+#
+
+
 TEMPLATE = lib
 TARGET = cpwpacmnui
+
+DEFINES += WPAUI_LIBRARY
 DEPENDPATH += 
-INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+
+INCLUDEPATH += \
+	$$MW_LAYER_SYSTEMINCLUDE \
     $$OS_LAYER_SYSTEMINCLUDE \
-    ../../inc
+    ../inc
     
 CONFIG += hb
-LIBS += -lcpframework \
+
+LIBS += \
+	-lcpframework \
     -leapqtplugininfo \
     -leapqtconfiginterface \
     -lconnection_settings_shim
+    
+MOC_DIR = _moc
+RCC_DIR = _rcc
+OBJECTS_DIR = _obj
 
 # Input
-HEADERS += traces/OstTraceDefinitions.h \
-    inc/cpwpacmnui_global.h \
-    inc/cpwpacmnui.h
-SOURCES += src/cpwpacmnui.cpp
-
-# QMAKE_EXTRA_TARGETS += copyheaders
-# directories
-#The actual path to be replaced later
-DESTDIR = HB_BUILD_DIR/lib
-win32:DLLDESTDIR = HB_BUILD_DIR/bin
-DEFINES += WPAUI_LIBRARY
+HEADERS += \
+	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
 
 defFilePath = ..
 
 symbian:
- { 
+{ 
+	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)"
+    
+    BLD_INF_RULES.prj_exports += \ 
+    	"./rom/cpwpacmnui.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpacmnui.iby)"
 }
 
-# Temporary solution to fix tracecompiler
-# When tracecompiler is fixed, this can be removed
-symbian: {
+symbian:
+{
     MMP_RULES += "USERINCLUDE traces"
 }
-
-TARGET.CAPABILITY = CAP_GENERAL_DLL