# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1278693012 -3600
# Node ID bb2936fa39e6ee7a87aad9d00cd5a4be0b8d1de3
# Parent  ce220d94201c29eb526b4a2af31024417b04e6b6# Parent  d0917ab8b45e738e130e09953eefe77fd77d5853
Merge RCL_3 heads

diff -r ce220d94201c -r bb2936fa39e6 Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r ce220d94201c -r bb2936fa39e6 sf_config/config/group/inc.inf
--- a/sf_config/config/group/inc.inf	Thu Jul 01 17:12:38 2010 +0100
+++ b/sf_config/config/group/inc.inf	Fri Jul 09 17:30:12 2010 +0100
@@ -24,9 +24,6 @@
 ../inc/bldvariant.hrh			              /epoc32/include/bldvariant.hrh
 ../inc/privateruntimeids.hrh		        /epoc32/include/privateruntimeids.hrh
 ../inc/publicruntimeids.hrh		          /epoc32/include/publicruntimeids.hrh
-../inc/PublicStaticFeatures.hrh		      /epoc32/include/PublicStaticFeatures.hrh
-../inc/PrivateStaticFeatures.hrh	      /epoc32/include/PrivateStaticFeatures.hrh
-../inc/PlatformStaticFeatures.hrh	      /epoc32/include/PlatformStaticFeatures.hrh
 ../inc/s60_features.xml	                /epoc32/include/s60_features.xml
 
 ../inc/bldpublic.hrh                    /epoc32/include/bldpublic.hrh
diff -r ce220d94201c -r bb2936fa39e6 sf_config/config/inc/PlatformStaticFeatures.hrh
--- a/sf_config/config/inc/PlatformStaticFeatures.hrh	Thu Jul 01 17:12:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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.
-*
-* Contributors:
-*
-* Description:  Defines Series 60 specific feature constants for common
-*                Feature Manager component. This file is included by
-*                Feature Manager component when building it.
-*                The counterpart for this file is the generic SpdStaticFeatures.hrh.
-*
-*/
-
-
-
-/* 
-*
-Usage of the file in the FeatMgr/featmgrstaticfeatures.hrh:
------------------------------------------------------------
-#include <bldvariant.hrh>
-const TInt KFeatMgrStaticFeatures[] =
-    {
-#include "SPDStaticFeatures.hrh"
-#include "PlatformStaticFeatures.hrh"
-    KFeatMgrFeatureArrayEndMark // End mark, don't remove!
-    };
-*/
-
-//includes domain specific Carbon generated files
-#include <PrivateStaticFeatures.hrh>
-#include <PublicStaticFeatures.hrh>
diff -r ce220d94201c -r bb2936fa39e6 sf_config/config/inc/PrivateStaticFeatures.hrh
--- a/sf_config/config/inc/PrivateStaticFeatures.hrh	Thu Jul 01 17:12:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1274 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#ifdef FF_M3G_ICON_RESOURCES
-KFeatureIdM3gIconResources,
-#endif
-
-#ifdef FF_SIMLESS_OFFLINE_SUPPORT
-KFeatureIdFfSimlessOfflineSupport,
-#endif
-
-#ifdef FF_SYSAP_TIMECHANGEOBSERVER_ENABLED
-KFeatureIdSysapTimechangeobserverEnabled,
-#endif
-
-#ifdef FF_TEST_AT_COMMAND
-KFeatureIdTestATCommand,
-#endif
-
-#ifdef FF_TOUCH_CALL_HANDLING
-KFeatureIdTouchCallHandling,
-#endif
-
-#ifdef FF_WS_NCIM
-KFeatureIdFfWsNcim,
-#endif
-
-#ifdef HLP_ADDITIONAL_CALENDAR
-KFeatureIdHlpAdditionalCalendar,
-#endif
-
-#ifdef HLP_CAMERA_KEY
-KFeatureIdHlpCameraKey,
-#endif
-
-#ifdef HLP_CLEAR_KEY
-KFeatureIdHlpClearKey,
-#endif
-
-#ifdef HLP_INTERNET_SUITE_VERY_LITE
-KFeatureIdHlpInternetSuiteVeryLite,
-#endif
-
-#ifdef HLP_ITUT_INPUT
-KFeatureIdHlpItutInput,
-#endif
-
-#ifdef HLP_MSK
-KFeatureIdHlpMsk,
-#endif
-
-#ifdef HLP_OMA_DRM_METERING
-KFeatureIdHlpOmaDrmMetering,
-#endif
-
-#ifdef HLP_PREMINET_CATALOGS_CLIENT
-KFeatureIdHlpPreminetCatalogsClient,
-#endif
-
-#ifdef HLP_RECENTLY_PLAYED_FOLDER
-KFeatureIdHlpRecentlyPlayedFolder,
-#endif
-
-#ifdef HLP_SENSOR_SETTINGS
-KFeatureIdHlpSensorSettings,
-#endif
-
-#ifdef HLP_WAYPOINTS
-KFeatureIdHlpWaypoints,
-#endif
-
-#ifdef JSR_135_SUPPORT
-KFeatureIdJsr135Support,
-#endif
-
-#ifdef SYMBIAN_EXCLUDE_DNS_PROXY
-KFeatureIdExcludeDnsProxy,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_DNS_PUNYCODE
-KFeatureIdDnsPunycode,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_AGPS_PM
-KFeatureIdLocationAgpsPM,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_GPS_PM
-KFeatureIdLocationGpsPm,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_NETWORK_PM
-KFeatureIdLocationNetworkPm,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_USB_RNDIS
-KFeatureIdIncludeUsbRndis,
-#endif
-
-#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
-SymbianMultimediaA3fdevsoundId,
-#endif
-
-#ifdef __AAC
-KFeatureIdAac,
-#endif
-
-#ifdef __ACCESSORY_FW
-KFeatureIdAccessoryFw,
-#endif
-
-#ifdef __ALWAYS_ONLINE
-KFeatureIdAlwaysOnLine,
-#endif
-
-#ifdef __ALWAYS_ONLINE_EMAIL
-KFeatureIdAlwaysOnLineEmail,
-#endif
-
-#ifdef __ALWAYS_ONLINE_PDPCONTEXT
-KFeatureIdAlwaysOnlinePDPContext,
-#endif
-
-#ifdef __ALWAYS_ONLINE_PDPCONTEXT2
-KFeatureIdAlwaysOnlinePDPContext2,
-#endif
-
-#ifdef __AMR_NB
-KFeatureIdAmrNb,
-#endif
-
-#ifdef __AMR_WB
-KFeatureIdAmrWb,
-#endif
-
-#ifdef __APPLICATION_CONTROLLABLE_AUDIO_ROUTING
-KFeatureIdApplicationControllableAudioRouting,
-#endif
-
-#ifdef __APPSHELL_AVKON_UI
-KFeatureIdAppshellAvkonUi,
-#endif
-
-#ifdef __ARM_AVC
-KFeatureIdArmAvc,
-#endif
-
-#ifdef __ARM_MDF_H263MPEG4_DEC
-KFeatureIdArmMdfH263mpeg4Dec,
-#endif
-
-#ifdef __ARM_MDF_H264_DEC
-KFeatureIdArmMdfH264Dec,
-#endif
-
-#ifdef __ARM_MDF_POSTPROCESSOR
-KFeatureIdArmMdfPostprocessor,
-#endif
-
-#ifdef __ARM_MDF_REALVIDEO_DEC
-KFeatureIdArmMdfRealvideoDec,
-#endif
-
-#ifdef __AT_HANDLER
-KFeatureIdAtHandler,
-#endif
-
-#ifdef __AUDIO_AAC
-KFeatureIdAudioAac,
-#endif
-
-#ifdef __AUDIO_CONTROLLER_STREAMING
-KFeatureIdAudioControllerStreaming,
-#endif
-
-#ifdef __AUDIO_PLAYLIST
-KFeatureIdAudioPlaylist,
-#endif
-
-#ifdef __AVC_DECODER
-KFeatureIdAvcDecoder,
-#endif
-
-#ifdef __AVC_ENCODER
-KFeatureIdAvcEncoder,
-#endif
-
-#ifdef __BEATNIK_AUDIOENGINE
-KFeatureIdBeatnikAudioengine,
-#endif
-
-#ifdef __BLUETOOTHGPSPSY
-KFeatureIdBluetoothGpsPsy,
-#endif
-
-#ifdef __BRANDING_SERVER
-KFeatureIdBrandingServer,
-#endif
-
-#ifdef __BROWSER_ADAPTIVE_BOOKMARKS
-KFeatureIdBrowserAdaptiveBookm,
-#endif
-
-#ifdef __BROWSER_AUDIO_PLUGIN
-KFeatureIdBrowserAudioPlugin,
-#endif
-
-#ifdef __BROWSER_FILE_UPLOAD
-KFeatureIdBrowserFileUpload,
-#endif
-
-#ifdef __BROWSER_FRAMES
-KFeatureIdBrowserFrames,
-#endif
-
-#ifdef __BROWSER_FULLSCREEN
-KFeatureIdBrowserFullScr,
-#endif
-
-#ifdef __BROWSER_NARROW_SCREEN
-KFeatureIdBrowserNarrowScreen,
-#endif
-
-#ifdef __BROWSER_NETSCAPE_API
-KFeatureIdBrowserNetscapeAPI,
-#endif
-
-#ifdef __BROWSER_PLUGIN_INTERFACE_PROXY
-KFeatureIdBrowserPluginInterfaceProxy,
-#endif
-
-#ifdef __BROWSER_PROGRESS_IND
-KFeatureIdBrowserProgressInd,
-#endif
-
-#ifdef __BROWSER_URL_COMPLETION
-KFeatureIdBrowserUrlCompletion,
-#endif
-
-#ifdef __BROWSER_VIDEO_PLUGIN
-KFeatureIdBrowserVideoPlugin,
-#endif
-
-#ifdef __BT
-KFeatureIdBt,
-#endif
-
-#ifdef __BTIC_ENABLED
-KFeatureIdBticEnabled,
-#endif
-
-#ifdef __BT_AUDIO
-KFeatureIdBtAudio,
-#endif
-
-#ifdef __BT_IMAGING_PROFILE
-KFeatureIdBtImagingProfile,
-#endif
-
-#ifdef __BT_PAN_PROFILE
-KFeatureIdBtPanProfile,
-#endif
-
-#ifdef __BT_PBAP
-KFeatureIdBtPbap,
-#endif
-
-#ifdef __BT_PRINTING_PROFILE
-KFeatureIdBtPrintingProfile,
-#endif
-
-#ifdef __BT_STEREO_AUDIO
-KFeatureIdBtStereoAudio,
-#endif
-
-#ifdef __BT_TEST_MODE
-KFeatureIdBtTestMode,
-#endif
-
-#ifdef __CAE_VR_CUSTOM_COMMANDS
-KFeatureIdCaeVrCustomCommands,
-#endif
-
-#ifdef __CALL_IMAGETEXT
-KFeatureIdCallImagetext,
-#endif
-
-#ifdef __CAMERA_BURST_MODE
-KFeatureIdCameraBurstMode,
-#endif
-
-#ifdef __CDMA_CHANNEL_LISTING
-KFeatureIdCdmaChannelListing,
-#endif
-
-#ifdef __CDMA_EXTENDED_AMS
-KFeatureIdCdmaExtendedAms,
-#endif
-
-#ifdef __CDMA_FAST_DORMANT
-KFeatureIdCdmaFastDormant,
-#endif
-
-#ifdef __CDMA_IOTA
-KFeatureIdCdmaIota,
-#endif
-
-#ifdef __CELL_BROADCAST
-KFeatureIdCellBroadcast,
-#endif
-
-#ifdef __CHATNG
-KFeatureIdChatNG,
-#endif
-
-#ifdef __COMMON_DSY
-KFeatureIdCommonDsy,
-#endif
-
-#ifdef __COMMON_TSY
-KFeatureIdCommonTsy,
-#endif
-
-#ifdef __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
-KFeatureIdCommonTsyEmergencyCallsEnabledInOfflineMode,
-#endif
-
-#ifdef __CONNMON_EXTENSION
-KFeatureIdConnMonExtension,
-#endif
-
-#ifdef __CONNMON_UI
-KFeatureIdConnMonUI,
-#endif
-
-#ifdef __CONTENT_DOWNLOAD
-KFeatureIdContentDownload,
-#endif
-
-#ifdef __DHCP
-KFeatureIdDHCP,
-#endif
-
-#ifdef __DIALUP_NETWORKING
-KFeatureIdDialupNetworking,
-#endif
-
-#ifdef __DISPLAY_POST
-KFeatureIdDisplayPost,
-#endif
-
-#ifdef __DPB
-KFeatureIdDpb,
-#endif
-
-#ifdef __DRIVE_MODE
-KFeatureIdDriveMode,
-#endif
-
-#ifdef __DRM_USER_DATA_TRANSFER
-KFeatureIdDrmUserDataTransfer,
-#endif
-
-#ifdef __DYNAMIC_PROFILES
-KFeatureIdDynamicProfiles,
-#endif
-
-#ifdef __EDGE_KNOWLEDGE
-KFeatureIdEdgeKnowledge,
-#endif
-
-#ifdef __EMAIL_UI
-KFeatureIdEmailUi,
-#endif
-
-#ifdef __EN_POLICY_DOS
-KFeatureIdEnPolicyDos,
-#endif
-
-#ifdef __EXE_PROTECTION
-KFeatureIdExeProtection,
-#endif
-
-#ifdef __EXTENDED_STARTUP
-KFeatureIdExtendedStartup,
-#endif
-
-#ifdef __FLIGHT_MODE
-KFeatureIdFlightMode,
-#endif
-
-#ifdef __GENERAL_SEARCH_FRAMEWORK
-KFeatureIdGeneralSearchFramework,
-#endif
-
-#ifdef __GENERAL_SEARCH_UI
-KFeatureIdGeneralSearchUi,
-#endif
-
-#ifdef __HINDI_ROM_CONTENT
-KFeatureIdHindiRomContent,
-#endif
-
-#ifdef __HTTP_DIGEST_AUTH
-KFeatureIdHttpDigestAuth,
-#endif
-
-#ifdef __HWRM_TARGET_MODIFIER_PLUGIN
-KFeatureIdHwrmTargetModifierPlugin,
-#endif
-
-#ifdef __ID3V2_METADATA
-KFeatureIdId3V2Metadata,
-#endif
-
-#ifdef __IETD
-KFeatureIdIetd,
-#endif
-
-#ifdef __IMAGE_UPLOAD
-KFeatureIdImageUpload,
-#endif
-
-#ifdef __INDIC_ROM_CONTENT
-KFeatureIdIndicRomContent,
-#endif
-
-#ifdef __INSTALLER_SISX
-KFeatureIdInstallerSisx,
-#endif
-
-#ifdef __IPV4_NAT
-KFeatureIdIPv4Nat,
-#endif
-
-#ifdef __IPV6
-KFeatureIdIPv6,
-#endif
-
-#ifdef __IP_PUSH
-KFeatureIdIpPush,
-#endif
-
-#ifdef __I_CAL_SUPPORT
-KFeatureIdICalSupport,
-#endif
-
-#ifdef __JAPANESE_PICTOGRAPHS_GROUPING
-KFeatureIdJapanesePictographsGrouping,
-#endif
-
-#ifdef __JAVA_3DAPI
-KFeatureIdJava3DAPI,
-#endif
-
-#ifdef __JAVA_API_ENHANCEMENTS_IAP
-KFeatureIdJavaApiEnhancementsIap,
-#endif
-
-#ifdef __JAVA_API_ENHANCEMENTS_MOBINFO
-KFeatureIdJavaApiEnhancementsMobinfo,
-#endif
-
-#ifdef __JAVA_ESWT
-KFeatureIdJavaESWT,
-#endif
-
-#ifdef __JAVA_FILEAPI
-KFeatureIdJavaFileAPI,
-#endif
-
-#ifdef __JAVA_J2MEWEBSERVICESAPI
-KFeatureIdJ2MEWebServicesAPI,
-#endif
-
-#ifdef __JAVA_JSR177_SECURITY_AND_TRUST_SERVICES_APDU
-KFeatureIdJavaJsr177SecurityAndTrustServicesApdu,
-#endif
-
-#ifdef __JAVA_JSR177_SECURITY_AND_TRUST_SERVICES_CRYPTO
-KFeatureIdJavaJsr177SecurityAndTrustServicesCrypto,
-#endif
-
-#ifdef __JAVA_JSR177_SECURITY_AND_TRUST_SERVICES_PKI
-KFeatureIdJavaJsr177SecurityAndTrustServicesPki,
-#endif
-
-#ifdef __JAVA_JSR205_WMA_2_0_SUPPORT
-KFeatureIdJavaJsr205Wma20Support,
-#endif
-
-#ifdef __JAVA_JSR_177_SECURITY_AND_TRUST_SERVICES
-KFeatureIdJavaJsr177SecurityAndTrustServices,
-#endif
-
-#ifdef __JAVA_JSR_180_SIP_API
-KFeatureIdJavaJsr180SipAPI,
-#endif
-
-#ifdef __JAVA_JSR_226_2D_SVG_API
-KFeatureIdJavaJsr2262DSvgAPI,
-#endif
-
-#ifdef __JAVA_JSR_234_3D_AUDIO_AND_MUSIC_CAPABILITIES
-KFeatureIdJavaJsr2343DAudioAndMusicCapabilities,
-#endif
-
-#ifdef __JAVA_LOCATIONAPI
-KFeatureIdJavaLocationAPI,
-#endif
-
-#ifdef __JAVA_MIDP20
-KFeatureIdJavaMIDP20,
-#endif
-
-#ifdef __JAVA_MMAPI11
-KFeatureIdJavaMMAPI11,
-#endif
-
-#ifdef __JAVA_PIMAPI
-KFeatureIdJavaPIMAPI,
-#endif
-
-#ifdef __KEEP_DRM_CONTENT_ON_PHONE
-KFeatureIdKeepDRMContentOnPhone,
-#endif
-
-#ifdef __LANDMARKS
-KFeatureIdLandmarks,
-#endif
-
-#ifdef __LANDMARKS_CONVERTER
-KFeatureIdLandmarksConverter,
-#endif
-
-#ifdef __LAYOUT176_208
-KFeatureIdLayout176_208,
-#endif
-
-#ifdef __LAYOUT208_176
-KFeatureIdLayout208_176,
-#endif
-
-#ifdef __LAYOUT_240_320_TOUCH
-KFeatureIdLayout240_320_Touch,
-#endif
-
-#ifdef __LAYOUT_320_240_TOUCH
-KFeatureIdLayout320_240_Touch,
-#endif
-
-#ifdef __LAYOUT_320_480
-KFeatureIdLayout320_480,
-#endif
-
-#ifdef __LAYOUT_320_480_TOUCH
-KFeatureIdLayout320_480_Touch,
-#endif
-
-#ifdef __LAYOUT_352_416
-KFeatureIdLayout352_416,
-#endif
-
-#ifdef __LAYOUT_352_800
-KFeatureIdLayout352_800,
-#endif
-
-#ifdef __LAYOUT_416_352
-KFeatureIdLayout416_352,
-#endif
-
-#ifdef __LAYOUT_480_320
-KFeatureIdLayout480_320,
-#endif
-
-#ifdef __LAYOUT_480_320_TOUCH
-KFeatureIdLayout480_320_Touch,
-#endif
-
-#ifdef __LAYOUT_480_640
-KFeatureIdLayout480_640,
-#endif
-
-#ifdef __LAYOUT_480_640_TOUCH
-KFeatureIdLayout480_640_Touch,
-#endif
-
-#ifdef __LAYOUT_640_480
-KFeatureIdLayout640_480,
-#endif
-
-#ifdef __LAYOUT_640_480_TOUCH
-KFeatureIdLayout640_480_Touch,
-#endif
-
-#ifdef __LAYOUT_800_352
-KFeatureIdLayout800_352,
-#endif
-
-#ifdef __LIGHTSURF
-KFeatureIdLightSurf,
-#endif
-
-#ifdef __LOCATIONFRAMEWORKCORE
-KFeatureIdLocationFrameworkCore,
-#endif
-
-#ifdef __LOCATIONSYSUI
-KFeatureIdLocationSysUi,
-#endif
-
-#ifdef __LOCATIONVERIFIER
-KFeatureIdLocationVerifier,
-#endif
-
-#ifdef __LOGGER_GPRS
-KFeatureIdLoggerGprs,
-#endif
-
-#ifdef __MANNER_MODE
-KFeatureIdMannerMode,
-#endif
-
-#ifdef __MAP_AND_NAVIGATION_AIW_PROVIDER
-KFeatureIdMapAndNavigationAiwProvider,
-#endif
-
-#ifdef __MEDIATOR
-KFeatureIdMediator,
-#endif
-
-#ifdef __MEETING_REQUEST_ENABLER
-KFeatureIdMeetingRequestEnabler,
-#endif
-
-#ifdef __MEETING_REQUEST_SUPPORT
-KFeatureIdMeetingRequestSupport,
-#endif
-
-#ifdef __MIPV4
-KFeatureIdMIPv4,
-#endif
-
-#ifdef __MIPV6
-KFeatureIdMIPv6,
-#endif
-
-#ifdef __MMC
-KFeatureIdMmc,
-#endif
-
-#ifdef __MMCOMMSAVCONTROLLER
-KFeatureIdMmCommsAvController,
-#endif
-
-#ifdef __MMCOMMSCONTROLLER
-KFeatureIdMmCommsController,
-#endif
-
-#ifdef __MMCOMMSENGINE
-KFeatureIdMmCommsEngine,
-#endif
-
-#ifdef __MMC_EJECT
-KFeatureIdMmcEject,
-#endif
-
-#ifdef __MMC_HOTSWAP
-KFeatureIdMmcHotswap,
-#endif
-
-#ifdef __MMC_LOCK
-KFeatureIdMmcLock,
-#endif
-
-#ifdef __MMF_DRM_UTILITY
-KFeatureIdMmfDrmUtility,
-#endif
-
-#ifdef __MMS
-KFeatureIdMMS,
-#endif
-
-#ifdef __MMS_XID_HEADER_HTTP_FILTER
-KFeatureIdMmsXidHeaderHttpFilter,
-#endif
-
-#ifdef __MOBILE_ACTIVE_SYNC
-KFeatureIdMobileActiveSync,
-#endif
-
-#ifdef __MP3
-KFeatureIdMp3,
-#endif
-
-#ifdef __MROUTER
-KFeatureIdMRouter,
-#endif
-
-#ifdef __MULTIMEDIA_SHARING
-KFeatureIdMultimediaSharing,
-#endif
-
-#ifdef __MULTIPLE_PROV_CTX
-KFeatureIdMultipleProvCtx,
-#endif
-
-#ifdef __NETWORK_REGISTRATION
-KFeatureIdNetworkRegistration,
-#endif
-
-#ifdef __NOT_SUPPORTED_FEATURE1
-KFeatureIdNotSupportedFeature1,
-#endif
-
-#ifdef __NOT_SUPPORTED_FEATURE2
-KFeatureIdNotSupportedFeature2,
-#endif
-
-#ifdef __NO_OTA_CONFIGURATION
-KFeatureIdNoOtaConfig,
-#endif
-
-#ifdef __NP_PROXY
-KFeatureIdNpProxy,
-#endif
-
-#ifdef __OCSP
-KFeatureIdOCSP,
-#endif
-
-#ifdef __OFFLINE_MODE
-KFeatureIdOfflineMode,
-#endif
-
-#ifdef __OMA_EMAIL_NOTIFICATIONS
-KFeatureIdOmaEmailNotifications,
-#endif
-
-#ifdef __OMA_IMPS_12
-KFeatureIdOmaImps12,
-#endif
-
-#ifdef __OMA_IMPS_13
-KFeatureIdOmaImps13,
-#endif
-
-#ifdef __OMA_PROV
-KFeatureIdOmaProv,
-#endif
-
-#ifdef __OMA_SUPL_PLUGINS
-KFeatureIdOmaSuplPlugins,
-#endif
-
-#ifdef __OPENVG_SW_IMPLEMENTATION
-KFeatureIdOpenvgSwImplementation,
-#endif
-
-#ifdef __PALETTE_INDEX_ADDRESS_FIXED
-KFeatureIdPaletteIndexAddressFixed,
-#endif
-
-#ifdef __PHONE_HIDE_MO_DATACALL_NUMBER
-KFeatureIdPhoneHideDataCallNbr,
-#endif
-
-#ifdef __PHONE_NUMBER_GROUPING
-KFeatureIdPhoneNumberGrouping,
-#endif
-
-#ifdef __PLUG_AND_PLAY_MOBILE_SERVICES
-KFeatureIdPlugAndPlayMobileServices,
-#endif
-
-#ifdef __PRESENCE_FRAMEWORK
-KFeatureIdPresenceFramework,
-#endif
-
-#ifdef __PRIVACYFRAMEWORK
-KFeatureIdPrivacyFramework,
-#endif
-
-#ifdef __PROTOCOL_CDMA
-KFeatureIdProtocolCdma,
-#endif
-
-#ifdef __PROTOCOL_GSM
-KFeatureIdProtocolGsm,
-#endif
-
-#ifdef __PROTOCOL_TDMA
-KFeatureIdProtocolTdma,
-#endif
-
-#ifdef __PUSH_WHITELIST
-KFeatureIdPushWhiteList,
-#endif
-
-#ifdef __QCELP
-KFeatureIdQcelp,
-#endif
-
-#ifdef __REAL_PLAYER_AS_DEFAULT
-KFeatureIdRealPlayerAsDefault,
-#endif
-
-#ifdef __REMOTE_LOCK
-KFeatureIdRemoteLock,
-#endif
-
-#ifdef __REMOTE_STORAGE_FW
-KFeatureIdRemoteStorageFw,
-#endif
-
-#ifdef __RESTRICTED_CALL_BARRING
-KFeatureIdRestrictedCallBarring,
-#endif
-
-#ifdef __RESTRICTED_CALL_DIVERT
-KFeatureIdRestrictedCallDivert,
-#endif
-
-#ifdef __RESTRICTED_VOICE_MAIL
-KFeatureIdRestrictedVoiceMail,
-#endif
-
-#ifdef __RFID
-KFeatureIdRfid,
-#endif
-
-#ifdef __SAP_APPLICATION_MANAGEMENT
-KFeatureIdSapApplicationManagement,
-#endif
-
-#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS
-KFeatureIdSapDeviceLockEnhancements,
-#endif
-
-#ifdef __SAP_EMBEDDED_LINK_ADAPTER
-KFeatureIdSapEmbeddedLinkAdapter,
-#endif
-
-#ifdef __SAP_IDLE_SOFTKEY_ADAPTER
-KFeatureIdSapIdleSoftkeyAdapter,
-#endif
-
-#ifdef __SAP_OPERATOR_LOGO_ADAPTER
-KFeatureIdSapOperatorLogoAdapter,
-#endif
-
-#ifdef __SAP_POLICY_MANAGEMENT
-KFeatureIdSapPolicyManagement,
-#endif
-
-#ifdef __SAP_SCREENSAVER_ADAPTER
-KFeatureIdSapScreensaverAdapter,
-#endif
-
-#ifdef __SAP_STARTUP_ADAPTER
-KFeatureIdSapStartupAdapter,
-#endif
-
-#ifdef __SAP_TERMINAL_CONTROL_FW
-KFeatureIdSapTerminalControlFw,
-#endif
-
-#ifdef __SAP_THEMES_ADAPTER
-KFeatureIdSapThemesAdapter,
-#endif
-
-#ifdef __SAP_UI_SETTING_SERVER
-KFeatureIdSapUiSettingServer,
-#endif
-
-#ifdef __SAP_WALLPAPER_ADAPTER
-KFeatureIdSapWallpaperAdapter,
-#endif
-
-#ifdef __SAT_BIP
-KFeatureIdSatBip,
-#endif
-
-#ifdef __SAT_CALL_CONTROL
-KFeatureIdSatCallControl,
-#endif
-
-#ifdef __SAT_DISPLAY_TEXT
-KFeatureIdSatDisplayText,
-#endif
-
-#ifdef __SAT_GET_INKEY
-KFeatureIdSatGetInkey,
-#endif
-
-#ifdef __SAT_GET_INPUT
-KFeatureIdSatGetInput,
-#endif
-
-#ifdef __SAT_LANGUAGE_NOTIFICATION
-KFeatureIdSatLanguageNotification,
-#endif
-
-#ifdef __SAT_LAUNCH_BROWSER
-KFeatureIdSatLaunchBrowser,
-#endif
-
-#ifdef __SAT_MO_SM_CONTROL
-KFeatureIdSatMoSmControl,
-#endif
-
-#ifdef __SAT_PLAY_TONE
-KFeatureIdSatPlayTone,
-#endif
-
-#ifdef __SAT_PROVIDE_LOCAL_INFO
-KFeatureIdSatProvideLocalInfo,
-#endif
-
-#ifdef __SAT_REFRESH
-KFeatureIdSatRefresh,
-#endif
-
-#ifdef __SAT_SELECT_ITEM
-KFeatureIdSatSelectItem,
-#endif
-
-#ifdef __SAT_SEND_DTMF
-KFeatureIdSatSendDtfm,
-#endif
-
-#ifdef __SAT_SEND_SM
-KFeatureIdSatSendSm,
-#endif
-
-#ifdef __SAT_SEND_SS
-KFeatureIdSatSendSs,
-#endif
-
-#ifdef __SAT_SEND_USSD
-KFeatureIdSatSendUssd,
-#endif
-
-#ifdef __SAT_SETUP_CALL
-KFeatureIdSatSetupCall,
-#endif
-
-#ifdef __SAT_SET_UP_EVENT_LIST
-KFeatureIdSatSetUpEventList,
-#endif
-
-#ifdef __SAT_SET_UP_IDLE_MODE_TEXT
-KFeatureIdSatSetUpIdleModeText,
-#endif
-
-#ifdef __SAT_SET_UP_MENU
-KFeatureIdSatSetUpMenu,
-#endif
-
-#ifdef __SCALABLE_ICONS
-KFeatureIdScalableIcons,
-#endif
-
-#ifdef __SEAMLESS_LINKS
-KFeatureIdSeamlessLinks,
-#endif
-
-#ifdef __SECURE_HW
-KFeatureIdSecureHW,
-#endif
-
-#ifdef __SERIES60_MIDI
-KFeatureIdMidi,
-#endif
-
-#ifdef __SERIES60_PHONE_2DIGIT_DIAL
-KFeatureIdPhone2DigitDial,
-#endif
-
-#ifdef __SERIES60_PHONE_CNAP
-KFeatureIdPhoneCnap,
-#endif
-
-#ifdef __SERIES60_PUSH_SL
-KFeatureIdPushSL,
-#endif
-
-#ifdef __SERIES60_PUSH_SP
-KFeatureIdPushSP,
-#endif
-
-#ifdef __SERIES60_REAL_PLAYER
-KFeatureIdRealPlayer,
-#endif
-
-#ifdef __SERIES60_SETTINGS_PROTECTION
-KFeatureIdSettingsProtection,
-#endif
-
-#ifdef __SIMCARD
-KFeatureIdSimCard,
-#endif
-
-#ifdef __SIMPLE_LOGS
-KFeatureIdSimpleLogs,
-#endif
-
-#ifdef __SIM_CERTIFICATES
-KFeatureIdSimCertificates,
-#endif
-
-#ifdef __SIM_PHONEBOOK_MATCH
-KFeatureIdSimPhonebookMatch,
-#endif
-
-#ifdef __SMARTMSG_SMS_BOOKMARK_RECEIVING
-KFeatureIdSmartmsgSMSBookmarkReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_GMS_MESSAGE_RECEIVING
-KFeatureIdSmartmsgSMSGmsMessageReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_GMS_MESSAGE_SENDING_SUPPORTED 
-KFeatureIdSmartmsgSMSGmsMessageSendingSupported,
-#endif
-
-#ifdef __SMARTMSG_SMS_IAP_SETTINGS_RECEIVING
-KFeatureIdSmartmsgSMSIapSettingsReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_OPERATOR_LOGO_RECEIVING
-KFeatureIdSmartmsgSMSOperatorLogoReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_RINGING_TONE_RECEIVING
-KFeatureIdSmartmsgSMSRingingToneReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_VCAL_RECEIVING
-KFeatureIdSmartmsgSMSVcalReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_VCAL_SENDING
-KFeatureIdSmartmsgSMSVcalSending,
-#endif
-
-#ifdef __SMARTMSG_SMS_VCARD_RECEIVING
-KFeatureIdSmartmsgSMSVcardReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_VCARD_SENDING
-KFeatureIdSmartmsgSMSVcardSending,
-#endif
-
-#ifdef __SMARTMSG_SMS_WAP_AP_RECEIVING
-KFeatureIdSmartmsgSMSWapApReceiving,
-#endif
-
-#ifdef __SMARTMSG_SMS_WV_SETTINGS_RECEIVING
-KFeatureIdSmartmsgSMSWvSettingsReceiving,
-#endif
-
-#ifdef __SMART_CARD_PROV
-KFeatureIdSmartCardProv,
-#endif
-
-#ifdef __SMIL_EDITOR
-KFeatureIdSmilEditor,
-#endif
-
-#ifdef __SMIL_STREAMING
-KFeatureIdSmilStreaming,
-#endif
-
-#ifdef __SRCS
-KFeatureIdSrcs,
-#endif
-
-#ifdef __SSO
-KFeatureIdSSO,
-#endif
-
-#ifdef __SUPL_FRAMEWORK
-KFeatureIdSuplFramework,
-#endif
-
-#ifdef __SUPPORTED_FEATURE1
-KFeatureIdSupportedFeature1,
-#endif
-
-#ifdef __SUPPORTED_FEATURE2
-KFeatureIdSupportedFeature2,
-#endif
-
-#ifdef __SVGT
-KFeatureIdSvgt,
-#endif
-
-#ifdef __SVGT_SCREENSAVER_PLUGIN
-KFeatureIdSvgtScreensaverPlugin,
-#endif
-
-#ifdef __SYNCML_DM
-KFeatureIdSyncMlDm,
-#endif
-
-#ifdef __SYNCML_DM_1_1_2
-KFeatureIdSyncMlDm112,
-#endif
-
-#ifdef __SYNCML_DM_DS
-KFeatureIdSyncMlDmDs,
-#endif
-
-#ifdef __SYNCML_DM_EMAIL
-KFeatureIdSyncMlDmEmail,
-#endif
-
-#ifdef __SYNCML_DM_IAP
-KFeatureIdSyncMlDmIAP,
-#endif
-
-#ifdef __SYNCML_DM_MMS
-KFeatureIdSyncMlDmMMS,
-#endif
-
-#ifdef __SYNCML_DM_STREAMING
-KFeatureIdSyncMlDmStreaming,
-#endif
-
-#ifdef __SYNCML_DS
-KFeatureIdSyncMlDs,
-#endif
-
-#ifdef __SYNCML_DS_AIW_PROVIDER
-KFeatureIdSyncMlDsAiwProvider,
-#endif
-
-#ifdef __SYNCML_DS_ALERT
-KFeatureIdSyncMlDsAlert,
-#endif
-
-#ifdef __SYNCML_DS_CAL
-KFeatureIdSyncMlDsCal,
-#endif
-
-#ifdef __SYNCML_DS_CON
-KFeatureIdSyncMlDsCon,
-#endif
-
-#ifdef __SYNCML_DS_EMAIL
-KFeatureIdSyncMlDsEmail,
-#endif
-
-#ifdef __SYNCML_DS_EMAIL_FILTERING
-KFeatureIdSyncMlDsEmailFiltering,
-#endif
-
-#ifdef __SYNCML_DS_OVER_HTTP
-KFeatureIdSyncMlDsOverHttp,
-#endif
-
-#ifdef __SYNCML_OBEX
-KFeatureIdSyncMlObex,
-#endif
-
-#ifdef __TELEPHONY_SERVICE
-KFeatureIdTelephonyService,
-#endif
-
-#ifdef __UI_TRANSITION_EFFECTS
-KFeatureIdUiTransitionEffects,
-#endif
-
-#ifdef __UI_ZOOM
-KFeatureIdUiZoom,
-#endif
-
-#ifdef __UPIN
-KFeatureIdUpin,
-#endif
-
-#ifdef __USB
-KFeatureIdUsb,
-#endif
-
-#ifdef __USB_DEVICE_LOCK
-KFeatureIdUsbDeviceLock,
-#endif
-
-#ifdef __USB_MULTIPERSONALITY
-KFeatureIdUsbMultiPersonality,
-#endif
-
-#ifdef __USB_PICTBRIDGE
-KFeatureIdUsbPictbridge,
-#endif
-
-#ifdef __USB_PICTBRIDGE_UI
-KFeatureIdUsbPictbridgeUi,
-#endif
-
-#ifdef __USB_PTP
-KFeatureIdUsbPtp,
-#endif
-
-#ifdef __USB_REMOTE_PERSONALITY
-KFeatureIdUsbRemotePersonality,
-#endif
-
-#ifdef __USB_STREAMING
-KFeatureIdUsbStreaming,
-#endif
-
-#ifdef __USER_CONFIGURABLE_USSD_MENU
-KFeatureIdUserConfigurableUssdMenu,
-#endif
-
-#ifdef __USE_DRMENGINE_IN_CCP
-KFeatureIdUseDrmEngineInCcp,
-#endif
-
-#ifdef __USSD
-KFeatureIdUSSD,
-#endif
-
-#ifdef __VIDEO_MENU
-KFeatureIdVideoMenu,
-#endif
-
-#ifdef __VOIP
-KFeatureIdCommonVoip,
-#endif
-
-#ifdef __WALLET
-KFeatureIdWallet,
-#endif
-
-#ifdef __WIM
-KFeatureIdWim,
-#endif
-
-#ifdef __WINDOWS_MEDIA
-KFeatureIdWindowsMedia,
-#endif
-
-#ifdef __WINDOWS_MEDIA_DRM
-KFeatureIdWindowsMediaDrm,
-#endif
-
-#ifdef __WSP
-KFeatureIdWsp,
-#endif
-
-#ifdef __XSP_EXTENSION_MANAGER
-KFeatureIdXspExtensionManager,
-#endif
-
diff -r ce220d94201c -r bb2936fa39e6 sf_config/config/inc/PublicStaticFeatures.hrh
--- a/sf_config/config/inc/PublicStaticFeatures.hrh	Thu Jul 01 17:12:38 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1339 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* 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.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#ifdef FF_3D_RINGING_TONES
-KFeatureId3DRingingTones,
-#endif
-
-#ifdef FF_3G_CELLBROADCAST
-KFeatureIdFf3gCellbroadcast,
-#endif
-
-#ifdef FF_ABC_AGRESSIVE_UI
-KFeatureIdFfAbcAgressiveUi,
-#endif
-
-#ifdef FF_ADAPTIVE_WLAN_SCANNING_SUPPORT
-KFeatureIdFfAdaptiveWlanScanningSupport,
-#endif
-
-#ifdef FF_ADDITIONAL_FONTS
-KFeatureIdFfAdditionalFonts,
-#endif
-
-#ifdef FF_AI_WLANSNIFFER_WIDGET
-KFeatureIdFfAiWlansnifferWidget,
-#endif
-
-#ifdef FF_ALTERNATIVE_CALL_WAITING_TONE
-KFeatureIdFfAlternativeCallWaitingTone,
-#endif
-
-#ifdef FF_ARABIC_HANDWRITING_RECOGNITION_INPUT
-KFeatureIdArabicHandwritingRecognitionInput,
-#endif
-
-#ifdef FF_ASYNCH_FILE_SAVE_QUEUE
-KFeatureIdAsynchFileSaveQueue,
-#endif
-
-#ifdef FF_AUDT
-KFeatureIdFfAudt,
-#endif
-
-#ifdef FF_AUTOMOTIVESTACK
-KFeatureIdFfAutomotivestack,
-#endif
-
-#ifdef FF_AUTO_REDIAL_FOR_VIDEO_CALL
-KFeatureIdAutoRedialForVideoCall,
-#endif
-
-#ifdef FF_AVKON_EMOTION_ICON_ENABLED
-KFeatureIdFfAvkonEmotionIconEnabled,
-#endif
-
-#ifdef FF_BIRTHDAY_IMPROVEMENT
-KFeatureIdFfBirthdayImprovement,
-#endif
-
-#ifdef FF_BLUETOOTH_DATA_PROFILES_DISABLED
-KFeatureIdFfBluetoothDataProfilesDisabled,
-#endif
-
-#ifdef FF_BLUETOOTH_DISABLED
-KFeatureIdFfBluetoothDisabled,
-#endif
-
-#ifdef FF_BROWSER_PROGRESSIVE_DOWNLOAD
-KFeatureIdBrowserProgressiveDownload,
-#endif
-
-#ifdef FF_CALENDAR_DAY_VIEW
-KFeatureIdFfCalDayView,
-#endif
-
-#ifdef FF_CALENDAR_SCROLLABLE_PREVIEW
-KFeatureIdFfCalScrollablePreview,
-#endif
-
-#ifdef FF_CAL_MEETING_REQUEST_UI
-KFeatureIdFfCalMeetingRequestUi,
-#endif
-
-#ifdef FF_CAPACITIVE_DISPLAY
-KFeatureIdFfCapacitiveDisplay,
-#endif
-
-#ifdef FF_CHINESE_FONTS_HIRES
-KFeatureIdChineseFontsHires,
-#endif
-
-#ifdef FF_CHINESE_SELECTION_KEY
-KFeatureIdFfChineseSelectionKey,
-#endif
-
-#ifdef FF_CLOCK_MULTIPROCOL_SUPPORT
-KFeatureIdFfClockMultiprocolSupport,
-#endif
-
-#ifdef FF_CMAIL_INTEGRATION
-KFeatureIdFfCmailIntegration,
-#endif
-
-#ifdef FF_COMMSDAT_CREATION_FROM_XML
-KFeatureIdCommsDatCreationFromXml,
-#endif
-
-#ifdef FF_CONNECTION_OVERRIDE
-KFeatureIdFfConnectionOverride,
-#endif
-
-#ifdef FF_CONTACTS_COMPANY_NAMES
-KFeatureIdFfContactsCompanyNames,
-#endif
-
-#ifdef FF_CONTACTS_MERGE
-KFeatureIdFfContactsMerge,
-#endif
-
-#ifdef FF_CONTACTS_MYCARD
-KFeatureIdffContactsMycard,
-#endif
-
-#ifdef FF_CONTACTS_NICKNAME
-KFeatureIdFfContactsNickname,
-#endif
-
-#ifdef FF_CONTACTS_PREDICTIVE_SEARCH
-KFeatureIdFfContactsPredictiveSearch,
-#endif
-
-#ifdef FF_CONTACTS_REMOTE_LOOKUP
-KFeatureIdFfContactsRemoteLookup,
-#endif
-
-#ifdef FF_CONTACTS_SOCIAL
-KFeatureIdFfContactsSocial,
-#endif
-
-#ifdef FF_CONTEXT_PROFILES
-KFeatureIdFfContextProfiles,
-#endif
-
-#ifdef FF_DEVICE_ENCRYPTION_FEATURE
-KFeatureIdFfDeviceEncryptionFeature,
-#endif
-
-#ifdef FF_DISABLE_OMA_SUPL_V2
-KFeatureIdFfDisableOmaSuplV2,
-#endif
-
-#ifdef FF_DM_CONNMO_ADAPTER
-KFeatureIdFfDmConnmoAdapter,
-#endif
-
-#ifdef FF_DM_INSTALL_SECURITY
-KFeatureIdDmInstallSecurity,
-#endif
-
-#ifdef FF_DUAL_LANGUAGE_SUPPORT
-KFeatureIdFfDualLanguageSupport,
-#endif
-
-#ifdef FF_DUAL_MODEM
-KFeatureIdDualModem,
-#endif
-
-#ifdef FF_EMAIL_FRAMEWORK
-KFeatureIdFfEmailFramework,
-#endif
-
-#ifdef FF_EMAIL_FULLSCREENVIEWER
-KFeatureIdFfEmailFullscreenviewer,
-#endif
-
-#ifdef FF_EMAIL_IPS_SERVICES
-KFeatureIdFfEmailIpsServices,
-#endif
-
-#ifdef FF_EMAIL_MCE_INTEGRATION
-KFeatureIdEmailMceIntegration,
-#endif
-
-#ifdef FF_EMAIL_PREDICTIVESEARCH
-KFeatureIdFfEmailPredictivesearch,
-#endif
-
-#ifdef FF_EMAIL_PROTOCOL_PLUGINS
-KFeatureIdFfEmailProtocolPlugins,
-#endif
-
-#ifdef FF_EMAIL_UI
-KFeatureIdFfEmailUi,
-#endif
-
-#ifdef FF_EMAIL_UI_SPLITSCREEN
-KFeatureIdFfEmailUiSplitscreen,
-#endif
-
-#ifdef FF_ENABLE_ISI_COMMUNICATION_IN_USB_CHARGING_MODE
-KFeatureIdEnableIsiCommunicationInUsbChargingMode,
-#endif
-
-#ifdef FF_ENHANCED_CALENDAR_EVENT_UI
-KFeatureIdFfEnhancedCalendarEventUi,
-#endif
-
-#ifdef FF_FARSI_CALENDAR
-KFeatureIdFfFarsiCalendar,
-#endif
-
-#ifdef FF_FMTX
-KFeatureIdFmtx,
-#endif
-
-#ifdef FF_FMTX_RDS_TEXT
-KFeatureIdFfFmtxRdsText,
-#endif
-
-#ifdef FF_FOTA_CHECK_LIMITATION
-KFeatureIdFfFotaCheckLimitation,
-#endif
-
-#ifdef FF_FULLSCR_HWR_INPUT
-KFeatureIdFullscrHwrInput,
-#endif
-
-#ifdef FF_GENERIC_ACCESS_NETWORK
-KFeatureIdFfGenericAccessNetwork,
-#endif
-
-#ifdef FF_GENERIC_FONTS_ASSETS
-KFeatureIdFfGenericFontsAssets,
-#endif
-
-#ifdef FF_HDMI
-KFeatureIdFfHdmi,
-#endif
-
-#ifdef FF_HELP_TUTORIAL_MERGE
-KFeatureIdFfHelpTutorialMerge,
-#endif
-
-#ifdef FF_HIJRI_CALENDAR
-KFeatureIdFfHijriCalendar,
-#endif
-
-#ifdef FF_HITCHCOCK_APP_SHELL
-KFeatureIdHitchcockAppShell,
-#endif
-
-#ifdef FF_HOMESCREEN_SWITCHABLE_ROOT
-KFeatureIdFfHomescreenSwitchableRoot,
-#endif
-
-#ifdef FF_IAUPDATE
-KFeatureIdIAUpdate,
-#endif
-
-#ifdef FF_IAUPDATE_PHASE2
-KFeatureIdFfIaupdatePhase2,
-#endif
-
-#ifdef FF_IMAGE_EDITOR
-KFeatureIdFfImageEditor,
-#endif
-
-#ifdef FF_INPUTS_PER_ORIENTATION
-KFeatureIdFfInputsPerOrientation,
-#endif
-
-#ifdef FF_INTELLIGENT_TEXT_INPUT
-KFeatureIdFfIntelligentTextInput,
-#endif
-
-#ifdef FF_IPSEC_UMA_SUPPORT_ENABLE
-KFeatureIdFfIpsecUmaSupportEnable,
-#endif
-
-#ifdef FF_ITI_VIRTUAL_TOUCH_FIRST_GENERATION_SUPPORT
-KFeatureIdFfItiVirtualTouchFirstGenerationSupport,
-#endif
-
-#ifdef FF_JAVA_GLOBAL_INDICATORS_API
-KFeatureIdFfJavaGlobalIndicatorsApi,
-#endif
-
-#ifdef FF_KEYPAD_NO_SEND_KEY
-KFeatureIdFfKeypadNoSendKey,
-#endif
-
-#ifdef FF_KOREAN
-KFeatureIdKorean,
-#endif
-
-#ifdef FF_LAYOUT_480_640_VGA3
-KFeatureIdFfLayout480640Vga3,
-#endif
-
-#ifdef FF_LAYOUT_640_480_VGA3
-KFeatureIdFfLayout640480Vga3,
-#endif
-
-#ifdef FF_LIMITED_MESSAGE_AND_ALARM_TONE_SIZE
-KFeatureIdFfLimitedMessageAndAlarmToneSize,
-#endif
-
-#ifdef FF_LINKED_FONTS_CHINESE
-KFeatureIdFfLinkedFontsChinese,
-#endif
-
-#ifdef FF_LOCATION_MW_APE_CENTRIC_ARCH_SUPPORT
-KFeatureIdFfLocationMwApeCentricArchSupport,
-#endif
-
-#ifdef FF_MECO_XMPP
-KFeatureIdFfMecoXmpp,
-#endif
-
-#ifdef FF_MEETING_REQUEST_UI
-KFeatureIdFfMeetingRequestUi,
-#endif
-
-#ifdef FF_MENU_TEXTURE_PRELOADING
-KFeatureIdFfMenuTexturePreloading,
-#endif
-
-#ifdef FF_MTP_CONTROLLER
-KFeatureIdS60MtpController,
-#endif
-
-#ifdef FF_NCD_ENGINE
-KFeatureIdFfNcdEngine,
-#endif
-
-#ifdef FF_NCD_UI
-KFeatureIdFfNcdUi,
-#endif
-
-#ifdef FF_NEAR_FIELD_COMMUNICATION
-KFeatureIdNfc,
-#endif
-
-#ifdef FF_NLT_SUPPORT
-KFeatureIdNltSupport,
-#endif
-
-#ifdef FF_NO_CUG_SUPPORT
-KFeatureIdFfNoCugSupport,
-#endif
-
-#ifdef FF_NO_IDLE_SOFTKEYS
-KFeatureIdNoIdleSoftkeys,
-#endif
-
-#ifdef FF_ODE_COPYRIGHT_NOTICE
-KFeatureIdFfOdeLegalNotice,
-#endif
-
-#ifdef FF_OFN_FEATURE
-KFeatureIdFfOfnFeature,
-#endif
-
-#ifdef FF_OMADRM1_FULL_SUPPORT
-KFeatureIdFfOmadrm1FullSupport,
-#endif
-
-#ifdef FF_OMADRM2_SUPPORT
-KFeatureIdFfOmadrm2Support,
-#endif
-
-#ifdef FF_OMA_SCOMO_ADAPTER
-KFeatureIdFfOmaScomoAdapter,
-#endif
-
-#ifdef FF_OSS_LEGAL_NOTICE
-KFeatureIdFfOssLegalNotice,
-#endif
-
-#ifdef FF_PLAYREADY_SUPPORT
-KFeatureIdFfPlayreadySupport,
-#endif
-
-#ifdef FF_PNPMS_PROV_FILTER
-KFeatureIdFfPnpmsProvFilter,
-#endif
-
-#ifdef FF_PNPMS_SERVICE_HELP_PLUGIN
-KFeatureIdPnpmsServiceHelpPlugin,
-#endif
-
-#ifdef FF_POWER_SAVE
-KFeatureIdPowerSave,
-#endif
-
-#ifdef FF_PREMINET_CATALOGS_CLIENT
-KFeatureIdPreminetCatalogsClient,
-#endif
-
-#ifdef FF_PROV_AUTHTYPE_PLUGIN
-KFeatureIdProvAuthtypePlugin,
-#endif
-
-#ifdef FF_QT
-KFeatureIdFfQt,
-#endif
-
-#ifdef FF_QWERTY_FN_KEY
-KFeatureIdQwertyFnKey,
-#endif
-
-#ifdef FF_ROCKER_KEY
-KFeatureIdRockerKey,
-#endif
-
-#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
-KFeatureIdFfRuntimeDeviceCapabilityConfiguration,
-#endif
-
-#ifdef FF_SELECTABLE_EMAIL
-KFeatureIdSelectableEmail,
-#endif
-
-#ifdef FF_SIDESLIDER_SUPPORT
-KFeatureIdFfSidesliderSupport,
-#endif
-
-#ifdef FF_SIM_CONSECUTIVE_6F00_ERRORS_HANDLING
-KFeatureIdFfSimConsecutive6f00ErrorsHandling,
-#endif
-
-#ifdef FF_SIP_APN_SWITCHING
-KFeatureIdFfSipApnSwitching,
-#endif
-
-#ifdef FF_SIP_CUSTOM_PDP_HANDLING
-KFeatureIdFfSipCustomPdpHandling,
-#endif
-
-#ifdef FF_SMALL_SCREEN_TOUCH
-KFeatureIdFfSmallScreenTouch,
-#endif
-
-#ifdef FF_STARTUP_OMA_DM_SUPPORT
-KFeatureStartupOmaDmSupport,
-#endif
-
-#ifdef FF_STROKE_INPUTMODE_IN_TAIWAN
-KFeatureIdFfStrokeInputmodeInTaiwan,
-#endif
-
-#ifdef FF_SUPL_IMSI_GENERATED_SERVER_PRIORITY_DEFAULT
-KFeatureIdFfSuplImsiGeneratedServerPriorityDefault,
-#endif
-
-#ifdef FF_SYNCML_STATUS_EXTENDED_ERROR_CODES
-KFeatureIdFfSyncmlStatusExtendedErrorCodes,
-#endif
-
-#ifdef FF_TACTICONS
-KFeatureIdFfTacticons,
-#endif
-
-#ifdef FF_TACTILE_FEEDBACK
-KFeatureIdTactileFeedback,
-#endif
-
-#ifdef FF_TARM_CAPABILITY_BASED_ACCESS
-KFeatureIdFfTarmCapabilityBasedAccess,
-#endif
-
-#ifdef FF_TARM_CAPABILITY_CHECKING
-KFeatureIdFfTarmCapabilityChecking,
-#endif
-
-#ifdef FF_TCP_MYFAVES_FEATURE
-KFeatureIdTcpMyfavesFeature,
-#endif
-
-#ifdef FF_TCP_MYPROFILE
-KFeatureIdFfTcpMyprofile,
-#endif
-
-#ifdef FF_TD_CLMContactReplicationFromPhonebookToUSIMCard
-KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard,
-#endif
-
-#ifdef FF_TD_CMCCATCommandsSupport
-KFeatureIdFfTdCmccatcommandssupport,
-#endif
-
-#ifdef FF_TD_CMCCPIMPromptServerFullWhenReceive420StatusCodeFromServer
-KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver,
-#endif
-
-#ifdef FF_TD_CMCCPIMSynchronizationProgressIndicatorUI 
-KFeatureIdFfTdCmccpimsynchronizationprogressindicatorui ,
-#endif
-
-#ifdef FF_TD_SCDMA
-KFeatureIdFfTdScdma,
-#endif
-
-#ifdef FF_TD_SCDMA_FORBIDDENOPERATORICONDISPLAY
-KFeatureIdFfTdScdmaForbiddenoperatoricondisplay,
-#endif
-
-#ifdef FF_TD_SCDMA_VIDEOCALL_KEY
-KFeatureIdFfTdScdmaVideocallKey,
-#endif
-
-#ifdef FF_TOUCHSCREENCALIB_IN_STARTUP
-KFeatureIdTouchscreencalibInStartup,
-#endif
-
-#ifdef FF_TOUCH_UNLOCK_STROKE
-KFeatureIdFfTouchUnlockStroke,
-#endif
-
-#ifdef FF_UPNP_FRAMEWORK_2_0
-KFeatureIdUpnpFramework20,
-#endif
-
-#ifdef FF_USB_CHARGING
-KFeatureIdUsbCharging,
-#endif
-
-#ifdef FF_USB_HOST
-KFeatureIdUsbHost,
-#endif
-
-#ifdef FF_USB_MODEM
-KFeatureIdUsbModem,
-#endif
-
-#ifdef FF_USE_EGPRS_ICON
-KFeatureIdUseEGprsIcon,
-#endif
-
-#ifdef FF_USE_NAVIKEY_FOR_VOLUME
-KFeatureIdFfUseNavikeyForVolume,
-#endif
-
-#ifdef FF_VIDEO_AUDIO_BRANDING
-KFeatureIdFfVideoAudioBranding,
-#endif
-
-#ifdef FF_VIDEO_EDITOR
-KFeatureIdFfVideoEditor,
-#endif
-
-#ifdef FF_VIRTUAL_FULLSCR_QWERTY_INPUT
-KFeatureIdVirtualFullscrQwertyInput,
-#endif
-
-#ifdef FF_VIRTUAL_ITUT_INPUT
-KFeatureIdVirtualItutInput,
-#endif
-
-#ifdef FF_VMBX_CALL_DIVERT_ICON
-KFeatureIdVmbxCallDivertIcon,
-#endif
-
-#ifdef FF_VOICE_CALL_CONTINUITY
-KFeatureIdFfVoiceCallContinuity,
-#endif
-
-#ifdef FF_VPN_CLIENT
-KFeatureIdFfVpnClient,
-#endif
-
-#ifdef FF_WEBVIDEO_PH2
-KFeatureIdWebvideoPh2,
-#endif
-
-#ifdef FF_WLAN_AUTHENTICATION_ONLY_SUPPORT
-KFeatureIdFfWlanAuthenticationOnlySupport,
-#endif
-
-#ifdef FF_WLAN_EXTENSIONS
-KFeatureIdFfWlanExtensions,
-#endif
-
-#ifdef FF_WLAN_WAPI
-KFeatureIdFfWlanWapi,
-#endif
-
-#ifdef FF_WMDRM_DLA_SUPPORT
-KFeatureIdFfWmdrmDlaSupport,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_NPE_DSM
-KFeatureIdSymbianIncludeLocationNpeDsm,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_POS_INIT
-KFeatureIdSymbianIncludeLocationSuplPosInit,
-#endif
-
-#ifdef SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY
-KFeatureIdSymbianIncludeLocationSuplProxy,
-#endif
-
-#ifdef __3D_MENU
-KFeatureId3DMenu,
-#endif
-
-#ifdef __3GP_EXTENTION
-KFeatureId3GpExtension,
-#endif
-
-#ifdef __AAC_ENCODER_PLUGIN
-KFeatureIdAacEncoderPlugin,
-#endif
-
-#ifdef __AAC_PLUS_DECODER_PLUGIN
-KFeatureIdAacPlusDecoderPlugin,
-#endif
-
-#ifdef __ACTIVE_IDLE
-KFeatureIdActiveIdle,
-#endif
-
-#ifdef __ALLOW_UPGRADE_HELIX
-KFeatureIdAllowUpgradeHelix,
-#endif
-
-#ifdef __APP_CSD_SUPPORT
-KFeatureIdAppCsdSupport,
-#endif
-
-#ifdef __AUDIO_EFFECTS_API
-KFeatureIdAudioEffectsApi,
-#endif
-
-#ifdef __AUDIO_MESSAGING
-KFeatureIdAudioMessaging,
-#endif
-
-#ifdef __AUDIO_RESOURCE_INDICATIONS
-KFeatureIdAudioResourceIndications,
-#endif
-
-#ifdef __AUTO_ACCESSORY_IDENTIFICATION
-KFeatureIdAutoAccessoryIdentification,
-#endif
-
-#ifdef __AVKON_APAC__
-KFeatureIdAvkonApac,
-#endif
-
-#ifdef __AVKON_ELAF__
-KFeatureIdAvkonELaf,
-#endif
-
-#ifdef __BASIC_LOCATION_INFO_DISPLAY
-KFeatureIdBasicLocationInfoDisplay,
-#endif
-
-#ifdef __BASS_BOOST_EFFECT_UI
-KFeatureIdBassBoostEffectUi,
-#endif
-
-#ifdef __BRIGHTNESS_CONTROL
-KFeatureIdBrightnessControl,
-#endif
-
-#ifdef __BROWSER_IMEI_NOTIFICATION
-KFeatureIdBrowserIMEINotification,
-#endif
-
-#ifdef __BTIC_BINARIES_CHECK_ENABLED
-KFeatureIdBticBinariesCheckEnabled,
-#endif
-
-#ifdef __BT_FAX_PROFILE
-KFeatureIdBtFaxProfile,
-#endif
-
-#ifdef __BT_SAP
-KFeatureIdBtSap,
-#endif
-
-#ifdef __CAMERA
-KFeatureIdCamera,
-#endif
-
-#ifdef __CAMERA_FULLSCREEN_VIEWFINDER
-KFeatureIdCameraFullscreenViewfinder,
-#endif
-
-#ifdef __CAMERA_LENS_COVER
-KFeatureIdCameraLensCover,
-#endif
-
-#ifdef __CAMERA_LOCATION_SUPPORT
-KFeatureIdCameraLocationSupport,
-#endif
-
-#ifdef __CHINESE
-KFeatureIdChinese,
-#endif
-
-#ifdef __CHINESE_PRC_FONTS
-KFeatureIdChinesePrcFonts,
-#endif
-
-#ifdef __CHINESE_TAIWAN_HK_FONTS
-KFeatureIdChineseTaiwanHkFonts,
-#endif
-
-#ifdef __COMMDB_PROTECTION
-KFeatureIdCommDBProtection,
-#endif
-
-#ifdef __COVER_DISPLAY
-KFeatureIdCoverDisplay,
-#endif
-
-#ifdef __CS_VIDEO_TELEPHONY
-KFeatureIdCsVideoTelephony,
-#endif
-
-#ifdef __CUSTOMISED_RFS
-KFeatureIdCustomisedRFS,
-#endif
-
-#ifdef __DEFAULT_CONNECTION
-KFeatureIdDefaultConnection,
-#endif
-
-#ifdef __DRM
-KFeatureIdDrm,
-#endif
-
-#ifdef __DRM_CLOCK
-KFeatureIdDrmClock,
-#endif
-
-#ifdef __DRM_FULL
-KFeatureIdDrmFull,
-#endif
-
-#ifdef __DRM_OMA2
-KFeatureIdDrmOma2,
-#endif
-
-#ifdef __DRM_PHASE2
-KFeatureIdDrmPhase2,
-#endif
-
-#ifdef __EDIT_KEY
-KFeatureIdEditKey,
-#endif
-
-#ifdef __EMAIL_OVER_SMS
-KFeatureIdEmailOverSms,
-#endif
-
-#ifdef __EQUALIZER
-KFeatureIdEqualizer,
-#endif
-
-#ifdef __FLASH_LITE_BROWSER_PLUGIN
-KFeatureIdFlashLiteBrowserPlugin,
-#endif
-
-#ifdef __FLASH_LITE_VIEWER
-KFeatureIdFlashLiteViewer,
-#endif
-
-#ifdef __FM_RADIO
-KFeatureIdFmRadio,
-#endif
-
-#ifdef __HANDWRITING_RECOGNITION_INPUT
-KFeatureIdHandwritingRecognitionInput,
-#endif
-
-#ifdef __HSXPA_SUPPORT
-KFeatureIdHsxpaSupport,
-#endif
-
-#ifdef __IM
-KFeatureIdIm,
-#endif
-
-#ifdef __IMAGE_VIEWER
-KFeatureIdImageViewer,
-#endif
-
-#ifdef __IMPS_STANDALONE_IP_CIR
-KFeatureIdImpsStandaloneIpCir,
-#endif
-
-#ifdef __INCLUDE_AAC_CMMFCODEC
-KFeatureIdIncludeAacCMMFCodec,
-#endif
-
-#ifdef __INCLUDE_AMR_NB_CMMFCODEC
-KFeatureIdIncludeAmrNbCMMFCodec,
-#endif
-
-#ifdef __INCLUDE_AMR_WB_CMMFCODEC
-KFeatureIdIncludeAmrWbCMMFCodec,
-#endif
-
-#ifdef __INCLUDE_EAACPLUS_CMMFCODEC
-KFeatureIdIncludeEaacplusCmmfcodec,
-#endif
-
-#ifdef __INCLUDE_MP3_CMMFCODEC
-KFeatureIdIncludeMp3CMMFCodec,
-#endif
-
-#ifdef __INCLUDE_QCELP_CMMFCODEC
-KFeatureIdIncludeQcelpCMMFCodec,
-#endif
-
-#ifdef __IPSEC
-KFeatureIdIpsec,
-#endif
-
-#ifdef __IRDA
-KFeatureIdIrda,
-#endif
-
-#ifdef __JAPANESE
-KFeatureIdJapanese,
-#endif
-
-#ifdef __JAPANESE_LARGER_DICTIONARY
-KFeatureIdJapaneseLargerDictionary,
-#endif
-
-#ifdef __JAPANESE_PICTOGRAPHS
-KFeatureIdJapanesePicto,
-#endif
-
-#ifdef __JAPAN_PREFIX_CHANGE
-KFeatureIdJapanPrefixChange,
-#endif
-
-#ifdef __JAVA
-KFeatureIdJava,
-#endif
-
-#ifdef __JAVA_STUBS
-KFeatureIdJavaStubs,
-#endif
-
-#ifdef __LAYOUT208_208
-KFeatureIdLayout208_208,
-#endif
-
-#ifdef __LAYOUT_240_320
-KFeatureIdLayout240_320,
-#endif
-
-#ifdef __LAYOUT_240_320_LARGE_SCREEN
-KFeatureIdLayout240_320_LargeScreen,
-#endif
-
-#ifdef __LAYOUT_240_320_QVGA3
-KFeatureIdLayout240_320_QVGA3,
-#endif
-
-#ifdef __LAYOUT_320_240
-KFeatureIdLayout320_240,
-#endif
-
-#ifdef __LAYOUT_320_240_LARGE_SCREEN
-KFeatureIdLayout320_240_LargeScreen,
-#endif
-
-#ifdef __LAYOUT_320_240_QVGA3
-KFeatureIdLayout320_240_QVGA3,
-#endif
-
-#ifdef __LAYOUT_360_640_TOUCH
-KFeatureIdLayout360_640_Touch,
-#endif
-
-#ifdef __LAYOUT_640_360_TOUCH
-KFeatureIdLayout640_360_Touch,
-#endif
-
-#ifdef __LOCATIONGPSHW
-KFeatureIdLocationGpsHw,
-#endif
-
-#ifdef __LOCATION_CENTRE
-KFeatureIdLocationCentre,
-#endif
-
-#ifdef __MACROMEDIA_FLASH_6
-KFeatureIdMacromediaFlash6,
-#endif
-
-#ifdef __MEDIA_TRANSFER_PROTOCOL
-KFeatureIdMediaTransferProtocol,
-#endif
-
-#ifdef __MMS_NONDESTRUCTIVE_FORWARD
-KFeatureIdMmsNonDestructiveForward,
-#endif
-
-#ifdef __MMS_NOTIFICATIONS_VIEW
-KFeatureIdMMSNotificationsView,
-#endif
-
-#ifdef __MMS_POSTCARD
-KFeatureIdMmsPostcard,
-#endif
-
-#ifdef __MPEG4_AAC_ENCODING
-KFeatureIdMpegAacEncoding,
-#endif
-
-#ifdef __MPEG4_VIDEO_ENCODING
-KFeatureIdMpeg4VideoEncoding,
-#endif
-
-#ifdef __MRT_SDK_LIBRARIES
-KFeatureIdMrtSdkLibraries,
-#endif
-
-#ifdef __MTP_PROTOCOL_SUPPORT
-KFeatureIdMtpProtocolSupport,
-#endif
-
-#ifdef __NEWSTICKER
-KFeatureIdNewsticker,
-#endif
-
-#ifdef __NO_POWERKEY
-KFeatureIdNoPowerkey,
-#endif
-
-#ifdef __OCR
-KFeatureIdOcr,
-#endif
-
-#ifdef __OCR_HANWANG
-KFeatureIdOcrHanwang,
-#endif
-
-#ifdef __OCR_ROMDB
-KFeatureIdOcrRomdb,
-#endif
-
-#ifdef __OMA_POC
-KFeatureIdOmaPoc,
-#endif
-
-#ifdef __ON_SCREEN_DIALER
-KFeatureIdOnScreenDialer,
-#endif
-
-#ifdef __OPENGL_ES_3DAPI
-KFeatureIdOpenGLES3DApi,
-#endif
-
-#ifdef __OPENGL_ES_SW_IMPLEMENTATION
-KFeatureIdOpenGLESSWImplementation,
-#endif
-
-#ifdef __OPERATOR_CACHE
-KFeatureIdOperatorCache,
-#endif
-
-#ifdef __OPERATOR_MENU
-KFeatureIdOperatorMenu,
-#endif
-
-#ifdef __PEN_SUPPORT
-KFeatureIdPenSupport,
-#endif
-
-#ifdef __PEN_SUPPORT_CALIBRATION
-KFeatureIdPenSupportCalibration,
-#endif
-
-#ifdef __PRESENCE
-KFeatureIdPresence,
-#endif
-
-#ifdef __PRODUCT_REMCON_TSP
-KFeatureIdProductRemconTsp,
-#endif
-
-#ifdef __PROTOCOL_WCDMA
-KFeatureIdProtocolWcdma,
-#endif
-
-#ifdef __PROTOCOL_WLAN
-KFeatureIdProtocolWlan,
-#endif
-
-#ifdef __QOS
-KFeatureIdQos,
-#endif
-
-#ifdef __QVGA2_LAYOUT_IN_USE
-KFeatureIdQvga2LayoutInUse,
-#endif
-
-#ifdef __QWERTY_INPUT
-KFeatureIdQwertyInput,
-#endif
-
-#ifdef __RSS_FEEDS
-KFeatureIdRssFeeds,
-#endif
-
-#ifdef __RTP_STACK
-KFeatureIdRtpStack,
-#endif
-
-#ifdef __RV9
-KFeatureIdRV9,
-#endif
-
-#ifdef __S60_FM_RADIO_APPLICATION
-KFeatureIdS60FmRadioApplication,
-#endif
-
-#ifdef __SDND
-KFeatureIdSdnd,
-#endif
-
-#ifdef __SENDUI_MMS_UPLOAD
-KFeatureIdSenduiMmsUpload,
-#endif
-
-#ifdef __SEND_FILE_IN_CALL
-KFeatureIdSendFileInCall,
-#endif
-
-#ifdef __SERIES60_AMBIENT_LIGHT_SENSOR
-KFeatureIdAmbientLightSensor,
-#endif
-
-#ifdef __SERIES60_HELP
-KFeatureIdHelp,
-#endif
-
-#ifdef __SERIES60_KEYPAD_NO_SLIDER
-KFeatureIdKeypadNoSlider,
-#endif
-
-#ifdef __SERIES60_KEYPAD_NO_VOICE_KEY
-KFeatureIdKeypadNoVoiceKey,
-#endif
-
-#ifdef __SERIES60_LUNAR_CALENDAR
-KFeatureIdLunarCalendar,
-#endif
-
-#ifdef __SERIES60_NATIVE_BROWSER
-KFeatureIdSeries60NativeBrowser,
-#endif
-
-#ifdef __SERIES60_PHONE_TTY
-KFeatureIdPhoneTty,
-#endif
-
-#ifdef __SHOW_PANICS
-KFeatureIdShowPanics,
-#endif
-
-#ifdef __SIDE_VOLUME_KEYS
-KFeatureIdSideVolumeKeys,
-#endif
-
-#ifdef __SIND
-KFeatureIdSind,
-#endif
-
-#ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL
-KFeatureIdSipSimplePresenceProtocol,
-#endif
-
-#ifdef __SLIDESHOW_SCREENSAVER
-KFeatureIdSlideshowScreensaver,
-#endif
-
-#ifdef __STEREO_WIDENING_EFFECT_UI
-KFeatureIdStereoWideningEffectUi,
-#endif
-
-#ifdef __SVGT_VIEWER
-KFeatureIdSvgtViewer,
-#endif
-
-#ifdef __SYNCML_DM_DIAGNOSTICS
-KFeatureIdSyncMlDmDiagnostics,
-#endif
-
-#ifdef __SYNCML_DM_FOTA
-KFeatureIdSyncMlDmFota,
-#endif
-
-#ifdef __SYNCML_DM_IMPS
-KFeatureIdSyncMlDmImps,
-#endif
-
-#ifdef __SYNCML_DM_OBEX
-KFeatureIdSyncMlDmObex,
-#endif
-
-#ifdef __SYNCML_DM_OTA
-KFeatureIdSyncMlDmOta,
-#endif
-
-#ifdef __SYNCML_DM_SIP
-KFeatureIdSyncMlDmSIP,
-#endif
-
-#ifdef __SYNCML_DM_VOIP
-KFeatureIdSyncMlDmVoIP,
-#endif
-
-#ifdef __SYNCML_DM_WLAN
-KFeatureIdSyncMlDmWlan,
-#endif
-
-#ifdef __SYNCML_DS_BOOKMARK
-KFeatureIdSyncMlDsBookmark,
-#endif
-
-#ifdef __SYNCML_DS_MMS
-KFeatureIdSyncMlDsMMS,
-#endif
-
-#ifdef __SYNCML_DS_NOTEPAD
-KFeatureIdSyncMlDsNotepad,
-#endif
-
-#ifdef __SYNCML_DS_SMS
-KFeatureIdSyncMlDsSms,
-#endif
-
-#ifdef __SYNCML_ISYNC
-KFeatureIdSyncMlIsync,
-#endif
-
-#ifdef __SYNCML_TWIN_SUITE
-KFeatureIdSyncMlTwinSuite,
-#endif
-
-#ifdef __THAI
-KFeatureIdThai,
-#endif
-
-#ifdef __THAI_CALENDAR
-KFeatureIdThaiCalendar,
-#endif
-
-#ifdef __TV_OUT
-KFeatureIdTvOut,
-#endif
-
-#ifdef __UPNP_AVCP
-KFeatureIdUpnpAvcp,
-#endif
-
-#ifdef __UPNP_MEDIASERVER
-KFeatureIdUpnpMediaserver,
-#endif
-
-#ifdef __UPNP_PRINT_FRAMEWORK
-KFeatureIdUpnpPrintFramework,
-#endif
-
-#ifdef __UPNP_REMOTE_STORAGE
-KFeatureIdUpnpRemoteStorage,
-#endif
-
-#ifdef __UPNP_STACK
-KFeatureIdUpnpStack,
-#endif
-
-#ifdef __USE_AAC_CMMFCODEC
-KFeatureIdUseAacCMMFCodec,
-#endif
-
-#ifdef __USE_AMR_NB_CMMFCODEC
-KFeatureIdUseAmrNbCMMFCodec,
-#endif
-
-#ifdef __USE_AMR_WB_CMMFCODEC
-KFeatureIdUseAmrWbCMMFCodec,
-#endif
-
-#ifdef __USE_EAACPLUS_CMMFCODEC
-KFeatureIdUseEaacplusCmmfCodec,
-#endif
-
-#ifdef __USE_MP3_CMMFCODEC
-KFeatureIdUseMp3CMMFCodec,
-#endif
-
-#ifdef __USE_QCELP_CMMFCODEC
-KFeatureIdUseQcelpCMMFCodec,
-#endif
-
-#ifdef __VFP_HW_SUPPORT
-KFeatureIdVfpHwSupport,
-#endif
-
-#ifdef __VIBRA
-KFeatureIdVibra,
-#endif
-
-#ifdef __VIDEOCALL_MENU_VISIBILITY
-KFeatureIdVideocallMenuVisibility,
-#endif
-
-#ifdef __VIDEO_CENTER_SUPPORTED
-KFeatureIdVideoCenterSupported,
-#endif
-
-#ifdef __VIDEO_RECORDER
-KFeatureIdVideoRecorder,
-#endif
-
-#ifdef __VIRTUAL_KEYBOARD_INPUT
-KFeatureIdVirtualKeyboardInput,
-#endif
-
-#ifdef __WEB_WIDGETS
-KFeatureIdWebWidgets,
-#endif
-
-#ifdef __WLAN_WEP256_ENABLED
-KFeatureIdWlanWep256Enabled,
-#endif
-
-#ifdef __WMA
-KFeatureIdWma,
-#endif
-
-#ifdef __WORLD_CLOCK
-KFeatureIdWorldClock,
-#endif
-
-#ifdef __XDM
-KFeatureIdXdm,
-#endif
-
-#ifdef __XDM_LOCALSTORAGE
-KFeatureIdXdmLocalStorage,
-#endif
-
-#ifdef __XDM_XCAP
-KFeatureIdXdmXcap,
-#endif
-
-/** Features added from customswstaticfeatures.hrh (removed from customswstaticfeatures.hrh) */
-
-#ifdef FF_MTP_ALBUM_ART
-KFeatureIdFfMtpAlbumArt,
-#endif
-
-#ifdef FF_MUSIC_PATH_PLUGIN
-KFeatureIdFfMusicPathPlugin,
-#endif
-
-#ifdef FF_POWER_KEY_AS_KEYGUARD
-KFeatureIdFfPowerKeyAsKeyguard,
-#endif
-
-#ifdef FF_DISPLAY_NETWORK_NAME_AFTER_CS_REGISTRATION
-KFeatureIdFfDisplayNetworkNameAfterCsRegistration,
-#endif
-
-#ifdef FF_MANUAL_SELECTION_POPULATED_PLMN_LIST
-KFeatureIdFfManualSelectionPopulatedPlmnList,
-#endif
-
-#ifdef FF_MOBILITY_MANAGEMENT_ERRORS
-KFeatureIdFfMobilityManagementErrors,
-#endif
-
-#ifdef FF_SERVICE_CALL_WHILE_PHONE_LOCKED
-KFeatureIdFfServiceCallWhilePhoneLocked,
-#endif
-
-#ifdef FF_LOCATIONSYSUI_HIDE_POSITIONING_MENU
-KFeatureIdFfLocationsysuiHidePositioningMenu,
-#endif
-
-#ifdef FF_MASTER_RESET_AND_CLEAR_SUBMENU
-KFeatureIdFfMasterResetAndClearSubmenu,
-#endif
-
-#ifdef FF_SIMLOCK_UI
-KFeatureIdFfSimlockUi,
-#endif
-
-#ifdef FF_ENTRY_POINT_FOR_VIDEO_SHARE
-KFeatureIdFfEntryPointForVideoShare,
-#endif
-
-#ifdef FF_IMS_DEREGISTRATION_IN_OFFLINE
-KFeatureIdFfImsDeregistrationInOffline,
-#endif
-
-#ifdef FF_IMS_DEREGISTRATION_IN_RFS
-KFeatureIdFfImsDeregistrationInRfs,
-#endif
-
-#ifdef FF_IMS_DEREGISTRATION_IN_VPN
-KFeatureIdFfImsDeregistrationInVpn,
-#endif
-
-#ifdef FF_INTRANET_BROWSING
-KFeatureIdFfIntranetBrowsing,
-#endif
-
-#ifdef FF_HOME_SCREEN_EASY_DIALING
-KFeatureIdProductIncludesHomeScreenEasyDialing,
-#endif
diff -r ce220d94201c -r bb2936fa39e6 sf_config/config/inc/bldpublic.hrh
--- a/sf_config/config/inc/bldpublic.hrh	Thu Jul 01 17:12:38 2010 +0100
+++ b/sf_config/config/inc/bldpublic.hrh	Fri Jul 09 17:30:12 2010 +0100
@@ -2198,9 +2198,7 @@
 binaries have been delivered to the licensee. More information is available in
 __JAVA flag definition."
 */
-// darios: __JAVA_STUBS must be enabled see bug 2616
-//#undef __JAVA_STUBS                                       
-#define __JAVA_STUBS                                       
+#undef __JAVA_STUBS                                       
 
 /** #__LAYOUT208_208 
 Device supports 208x208 resolution (square)