--- a/securitysettings/cpwlansecurityuiplugins/cpwpaui/cpwpaui.pro	Thu May 13 22:51:27 2010 +0300
+++ b/securitysettings/cpwlansecurityuiplugins/cpwpaui/cpwpaui.pro	Mon May 24 20:32:47 2010 +0300
@@ -4,68 +4,74 @@
 # 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:
-# Control Panel QT UI for WPA configuration
-# %version: tr1cfwln#7 %
+# 	Control Panel UI for WPA/WPA2 only Security mode
+#
+# %version: 15 %
+#
+
 TEMPLATE = lib
 TARGET = cpwpaui
+
 DEPENDPATH += 
-INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE \
+
+INCLUDEPATH += \ 
+	$$MW_LAYER_SYSTEMINCLUDE \
     $$OS_LAYER_SYSTEMINCLUDE \
-    ../cpwpacmnui/inc \
-    ../../inc
+    ../inc
     
-CONFIG += hb \
+CONFIG += \
+	hb \
     plugin
-LIBS += -lcpframework \
-    -leapqtplugininfo \
+    
+LIBS += \
+	-lcpframework \
     -lcpwpacmnui \
-    -lconnection_settings_shim
+    -lconnection_settings_shim \
+    -leapqtconfiginterface
+    
 MOC_DIR = _moc
 RCC_DIR = _rcc
 OBJECTS_DIR = _objects
 
 # Input
-HEADERS += inc/wpakeyvalidator.h \
-    traces/OstTraceDefinitions.h \
+HEADERS += \
+	traces/OstTraceDefinitions.h \
     inc/cpwpaui.h
-SOURCES += src/wpakeyvalidator.cpp \
-    src/cpwpaui.cpp
-symbian: { 
+    
+SOURCES += src/cpwpaui.cpp
+
+symbian: 
+{ 
+	TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.UID3 = 0x2002C301
-    LIBS += -leapqtconfiginterface
-    BLD_INF_RULES.prj_exports += "rom/cpwpaui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpaui.iby)"
-}
-symbian { 
+
     deploy.path = C:
     qtplugins.path = /resource/qt/plugins/controlpanel/wlansecurity
     qtplugins.sources += qmakepluginstubs/cpwpaui.qtplugin
+    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
     
-    # This is for new exporting system coming in garden
-    for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+    BLD_INF_RULES.prj_exports += \
+    	"rom/cpwpaui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpaui.iby)"
 }
 
-# temporary not used; waiting for the latest .ts file ; accordingly export will change
-# translation file temporarily read as qt resource
-# TRANSLATIONS += /resource/qtwlan_en_GB.ts
-
-# Temporary solution to fix tracecompiler
-# When tracecompiler is fixed, this can be removed
-symbian: {
+symbian:
+{
     MMP_RULES += "USERINCLUDE traces"
 }
 
-RESOURCES += resources/resource.qrc
+# common translation file for all plugins
+TRANSLATIONS = cpwlansecsettingsplugin.ts
 
-TARGET.CAPABILITY = CAP_GENERAL_DLL
-dynamiclibrary.sources = cpwpacmnui.dll
-dynamiclibrary.path = /sys/bin
 plugin.sources += cpwpaui.dll
 plugin.path = /resource/qt/plugins/controlpanel
-DEPLOYMENT += plugin \
-    dynamiclibrary
 
+DEPLOYMENT += plugin
+