diff -r e03a3db4489e -r 9abfd4f00d37 securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro --- a/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro Thu May 13 22:51:27 2010 +0300 +++ b/securitysettings/cpwlansecurityuiplugins/cpwpa2ui/cpwpa2ui.pro Mon May 24 20:32:47 2010 +0300 @@ -1,69 +1,78 @@ +# # 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: tr1cfwln#5 % +# Control Panel UI for WPA2 only security mode +# +# %version: 14 % +# + TEMPLATE = lib TARGET = cpwpa2ui + 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/wpa2keyvalidator.h \ - traces/OstTraceDefinitions.h \ +HEADERS += \ + traces/OstTraceDefinitions.h \ inc/cpwpa2ui.h -SOURCES += src/wpa2keyvalidator.cpp \ - src/cpwpa2ui.cpp -symbian: { + +SOURCES += src/cpwpa2ui.cpp + +symbian: +{ + TARGET.CAPABILITY = CAP_GENERAL_DLL TARGET.EPOCALLOWDLLDATA = 1 TARGET.UID3 = 0x2002DC73 - LIBS += -leapqtconfiginterface - BLD_INF_RULES.prj_exports += "rom/cpwpa2ui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpa2ui.iby)" -} -symbian { + deploy.path = C: qtplugins.path = /resource/qt/plugins/controlpanel/wlansecurity qtplugins.sources += qmakepluginstubs/cpwpa2ui.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/cpwpa2ui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cpwpa2ui.iby)" } -# Temporary solution to fix tracecompiler -# When tracecompiler is fixed, this can be removed -symbian: { +symbian: +{     MMP_RULES += "USERINCLUDE traces" } -# 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 +# common translation file for all plugins +TRANSLATIONS = cpwlansecsettingsplugin.ts -RESOURCES += resources/resource.qrc - -TARGET.CAPABILITY = CAP_GENERAL_DLL -dynamiclibrary.sources = cpwpacmnui.dll -dynamiclibrary.path = /sys/bin plugin.sources += cpwpa2ui.dll plugin.path = /resource/qt/plugins/controlpanel -DEPLOYMENT += plugin \ - dynamiclibrary + +DEPLOYMENT += plugin +