--- a/appfw/apparchitecture/apserv/APSRECCACHE.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSRECCACHE.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 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"
@@ -38,8 +38,13 @@
CRecognitionResultHashMapEntry::~CRecognitionResultHashMapEntry()
{
- iResult->Close();
- iResult = NULL;
+
+ if(iResult != NULL)
+ {
+ iResult->Close();
+ iResult = NULL;
+ }
+
delete iNext;
}
--- a/appfw/apparchitecture/group/apparc.iby Fri Sep 17 08:30:44 2010 +0300
+++ b/appfw/apparchitecture/group/apparc.iby Mon Oct 04 00:28:21 2010 +0300
@@ -54,7 +54,7 @@
file=ABI_DIR\BUILD_DIR\apfile.dll System\Libs\apfile.dll
file=ABI_DIR\BUILD_DIR\aplist.dll System\Libs\aplist.dll
file=ABI_DIR\BUILD_DIR\apgrfx.dll System\Libs\apgrfx.dll
-file=ABI_DIR\DEBUG_DIR\apserv.dll System\Libs\apserv.dll
+file=ABI_DIR\BUILD_DIR\apserv.dll System\Libs\apserv.dll
file=ABI_DIR\BUILD_DIR\apsexe.exe System\Programs\apsexe.exe
file=ABI_DIR\BUILD_DIR\ServiceRegistry.dll System\Libs\ServiceRegistry.dll
--- a/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Fri Sep 17 08:30:44 2010 +0300
+++ b/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Mon Oct 04 00:28:21 2010 +0300
@@ -21,9 +21,9 @@
data=ABI_DIR\BUILD_DIR\tapstart_server.exe sys\bin\tapstart_server.exe
-//data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat
+data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat
-//data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script
+data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script
#endif
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/ConsoleAlarmAlertSession.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -41,8 +41,11 @@
CancelNotifications();
__FLOG_CLOSE;
+ if(iServer != NULL)
+ {
CConsoleAlarmAlertSession* session = iServer->WaitingSession();
session = NULL;
+ }
delete iSoundLEDFlasher;
delete iSoundCallbackTimer;
delete iConsole;
--- a/commonappservices/alarmserver/Group/AlarmServer.iby Fri Sep 17 08:30:44 2010 +0300
+++ b/commonappservices/alarmserver/Group/AlarmServer.iby Mon Oct 04 00:28:21 2010 +0300
@@ -20,11 +20,6 @@
REM Alarm Server
-#include <BackupRestoreNotification.iby>
-#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
-#include <ssmsus.iby>
-#endif
-
#ifndef DATAZ_
define DATAZ_ EPOCROOT##epoc32\data\Z
#endif
--- a/commonappservices/alarmserver/Group/Bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/commonappservices/alarmserver/Group/Bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -37,7 +37,7 @@
// Console Alarm Alert Server
../ConsoleAlarmAlertServer/Include/ConsoleAlarmAlertServerMain.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(consolealarmalertservermain.h)
-AlarmServer.iby /epoc32/rom/include/alarmserver.iby
+AlarmServer.iby CORE_MW_LAYER_IBY_EXPORT_PATH(alarmserver.iby)
backup_registration.xml /epoc32/data/z/private/101f5027/backup_registration.xml
backup_registration.xml /epoc32/release/winscw/udeb/z/private/101f5027/backup_registration.xml
--- a/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -183,7 +183,7 @@
{
FUNC_LOG;
- for (TInt i = iPendingTasks.Count(); i > 0; i--)
+ for (TInt i = iPendingTasks.Count()-1; i >= 0; i--)
{
CCFPendingPersistencyTask* iTask = iPendingTasks[i];
if ( iTask->Mode() == CCFPendingPersistencyTask::EStore )
--- a/contextframework/cfw/tsrc/public/basic/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -39,7 +39,7 @@
../data/testsettings/10282BDA.txt\
/epoc32/data/z/private/10202be9/10282BDA.txt
../data/testsettings/10282BDA.txt\
- /epoc32/release/winscw/udeb/Z/private/10202be9/10282BDA.txt
+ /epoc32/release/winscw/udeb/z/private/10202be9/10282BDA.txt
../data/testsettings/testcontextsourcesetting1.xml\
/epoc32/data/z/private/10282BC4/Settings/10002001/testcontextsourcesetting1.xml
--- a/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/DbRecovery/Src/CDbRecovery.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -350,7 +350,7 @@
static void PrepareRecoveryL()
{
// Rename thread - ignore error
- User().RenameThread( KDbRecoveryThreadName );
+ User::RenameThread( KDbRecoveryThreadName );
CActiveScheduler* scheduler = new(ELeave) CActiveScheduler();
CleanupStack::PushL(scheduler);
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -25,7 +25,7 @@
../rom/rfscustcmdtest.iby CORE_OS_LAYER_IBY_EXPORT_PATH( rfscustcmdtest.iby )
../data/excludelist.txt /epoc32/release/winscw/udeb/z/private/100059C9/excludelist.txt
../data/excludelist.txt /epoc32/release/winscw/urel/z/private/100059C9/excludelist.txt
-../data/excludelist.txt /epoc32/data/Z/private/100059C9/excludelist.txt
+../data/excludelist.txt /epoc32/data/z/private/100059C9/excludelist.txt
// Export file for emulator. For HW file come from pkg
../init/rfscustcmdtest.ini /epoc32/winscw/c/testframework/rfscustcmdtest.ini
--- a/coreapplicationuis/Rfs/src/rfsCommand.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfsCommand.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -302,8 +302,8 @@
TFindFile find( iServer->iFs );
CDir* files (NULL);
- find.FindWildByPath( fileName, NULL, files );
- if ( files )
+ TInt ret = find.FindWildByPath( fileName, NULL, files );
+ if ((ret == KErrNone) && files )
{
TRACES("CRfsCommand::ExecuteL(): Target file already exists ");
return KErrNone;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -0,0 +1,124 @@
+/*
+* 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 "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: CSysApCenRepSilentModeObserver implementation.
+ *
+*/
+
+
+// INCLUDE FILES
+#include "SysApCenRepSilentModeObserver.h"
+#include "SysApAppUi.h"
+#include <hbindicatorsymbian.h>
+
+// ========================== MEMBER FUNCTIONS ================================
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+CSysApCenRepSilentModeObserver* CSysApCenRepSilentModeObserver::NewL( )
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::NewL" ) ) );
+ CSysApCenRepSilentModeObserver* self = new ( ELeave ) CSysApCenRepSilentModeObserver( );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop(); //self
+ return self;
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver( )
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::CSysApCenRepSilentModeObserver" ) ) );
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+CSysApCenRepSilentModeObserver::~CSysApCenRepSilentModeObserver()
+ {
+ TRACES( RDebug::Print( _L("~CSysApCenRepSilentModeObserver") ) );
+ if ( iSilentModeHandler )
+ {
+ iSilentModeHandler->StopListening();
+ }
+ delete iSilentModeHandler;
+ delete iSession;
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepSilentModeObserver::ConstructL()
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) );
+ iSession = CRepository::NewL( KCRUidProfileEngine );
+
+ iSilentModeHandler =
+ CCenRepNotifyHandler::NewL( *this,
+ *iSession,
+ CCenRepNotifyHandler::EIntKey,
+ KProEngSilenceMode );
+ iSilentModeHandler->StartListeningL();
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepSilentModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue )
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d" ), aId, aNewValue ) );
+
+ SilenceIndicatorL(aNewValue);
+
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepSilentModeObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ )
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyError()" ) ) );
+ }
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepSilentModeObserver::SilenceIndicatorL(TInt aValue)
+ {
+ TRACES( RDebug::Print( _L(" CSysApCenRepSilentModeObserver::SilenceIndicatorL" )));
+ CHbIndicatorSymbian* indicator = CHbIndicatorSymbian::NewL();
+ CleanupStack::PushL(indicator);
+ _LIT(KSilentmodeindicator,"com.nokia.hb.indicator.controlpanel.cpsilenceindicatorplugin/1.0");
+
+
+ if (aValue)
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() activate silence indicator" )));
+ // activate the indicator plugin to display the icon in status bar
+ indicator->Activate(KSilentmodeindicator);
+ }
+ else
+ {
+ TRACES( RDebug::Print( _L("CSysApCenRepSilentModeObserver::HandleNotifyInt() Deactivate silence indicator" )));
+ // deactivate the indicator plugin to remove the icon in the status bar
+ indicator->Deactivate(KSilentmodeindicator);
+ }
+ CleanupStack::PopAndDestroy(indicator); // indicator
+ }
+
+
+// End of File
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepSilentModeObserver.h Mon Oct 04 00:28:21 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* 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 "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: CSysApCenRepSilentModeObserver class definition.
+*
+*/
+
+
+#ifndef SYSAPCENREPSILENTMODEOBSERVER_H
+#define SYSAPCENREPSILENTMODEOBSERVER_H
+
+// INCLUDES
+#include <e32base.h>
+#include <centralrepository.h>
+#include "SysAp.hrh"
+#include <cenrepnotifyhandler.h>
+#include <ProfileEngineDomainCRKeys.h>
+
+// CLASS DECLARATION
+
+
+class CSysApCenRepSilentModeObserver : public CBase, public MCenRepNotifyHandlerCallback
+ {
+ public: // Constructors and destructor
+ /**
+ * Default constructor
+ */
+ static CSysApCenRepSilentModeObserver* NewL( );
+
+ /**
+ * Destructor.
+ */
+ ~CSysApCenRepSilentModeObserver();
+
+ // From MCenRepNotifyHandlerCallback
+ void HandleNotifyInt( TUint32 aId, TInt aNewValue );
+ void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler );
+
+ private:
+
+ /**
+ * @param None
+ * @return void
+ */
+ void ConstructL( );
+
+
+ /**
+ * C++ default constructor.
+ * @param None
+ * @return void
+ */
+ CSysApCenRepSilentModeObserver();
+
+
+ //To activate and Deactivate the indicator
+ void SilenceIndicatorL(TInt avalue);
+
+
+
+
+ private:
+
+ CRepository* iSession;
+ //To listen to the silentmodekey
+ CCenRepNotifyHandler* iSilentModeHandler;
+ };
+
+#endif // SYSAPCENREPSILENTMODEOBSERVER_H
+
+// End of File
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -20,10 +20,10 @@
PRJ_TESTEXPORTS
remconservercaps.mmh /epoc32/include/remcon/remconservercaps.mmh
-../data/keyevent.rul /epoc32/data/Z/private/10282bc4/rules/keyevent.rul
-../data/keyevent.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyevent.rul
-../data/keyincall.rul /epoc32/data/Z/private/10282bc4/rules/keyincall.rul
-../data/keyincall.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/keyincall.rul
+../data/keyevent.rul /epoc32/data/z/private/10282bc4/rules/keyevent.rul
+../data/keyevent.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyevent.rul
+../data/keyincall.rul /epoc32/data/z/private/10282bc4/rules/keyincall.rul
+../data/keyincall.rul /epoc32/release/winscw/udeb/z/private/10282BC4/Rules/keyincall.rul
PRJ_TESTMMPFILES
../../../group/RemConTspController.mmp
\ No newline at end of file
--- a/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -42,6 +42,8 @@
{
//Translator loaded succesfully then olny construct widgets
constructDialog(parameters);
+ this->actions()[0]->setEnabled(true);
+
if (!mPrimaryAction) {
// If default button provided by HbInputDialog is used, connect into its triggered signal.
QAction *action = /*primaryAction()*/this->actions().first();
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -64,20 +64,20 @@
../data/testspec_015.txt /epoc32/winscw/c/testdata/testspec_015.txt
// Application specific exclude list(s) exported to rom drive
-../data/app_spec_rom_001.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_001.exc
+../data/app_spec_rom_001.exc /epoc32/data/z/private/102073ea/excludes/app_spec_001.exc
../data/app_spec_rom_001.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_001.exc
../data/app_spec_rom_001.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_001.exc
-../data/app_spec_rom_002.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_002.exc
+../data/app_spec_rom_002.exc /epoc32/data/z/private/102073ea/excludes/app_spec_002.exc
../data/app_spec_rom_002.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_002.exc
../data/app_spec_rom_002.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_002.exc
-../data/app_spec_rom_dummy.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_dummy.exc
+../data/app_spec_rom_dummy.exc /epoc32/data/z/private/102073ea/excludes/app_spec_dummy.exc
../data/app_spec_rom_dummy.exc /epoc32/release/winscw/udeb/z/private/102073ea/excludes/app_spec_dummy.exc
../data/app_spec_rom_dummy.exc /epoc32/release/winscw/urel/z/private/102073ea/excludes/app_spec_dummy.exc
-../data/app_spec_003.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_003.exc
-../data/app_spec_004.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_004.exc
-../data/app_spec_005.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_005.exc
-../data/app_spec_006.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_006.exc
-../data/app_spec_007.exc /epoc32/data/Z/private/102073ea/excludes/app_spec_007.exc
+../data/app_spec_003.exc /epoc32/data/z/private/102073ea/excludes/app_spec_003.exc
+../data/app_spec_004.exc /epoc32/data/z/private/102073ea/excludes/app_spec_004.exc
+../data/app_spec_005.exc /epoc32/data/z/private/102073ea/excludes/app_spec_005.exc
+../data/app_spec_006.exc /epoc32/data/z/private/102073ea/excludes/app_spec_006.exc
+../data/app_spec_007.exc /epoc32/data/z/private/102073ea/excludes/app_spec_007.exc
// Application specific test specs and exclude lists
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -28,7 +28,7 @@
../sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul
// context source setting for test ps keys
-../101FB3E7.xml /epoc32/data/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../101FB3E7.xml /epoc32/data/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
// Iby export
../../rom/sensordatacontrollerplgtest.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacontrollerplgtest.iby )
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -27,14 +27,14 @@
../conf/sensordatacompensatorplgtest.cfg /epoc32/winscw/c/TestFramework/sensordatacompensatorplgtest.cfg
// Rule files
-../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul
// context source setting for test ps keys
-../data/101FB3E7.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
-../data/101FB3E7.xml /epoc32/RELEASE/winscw/UREL/Z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../data/101FB3E7.xml /epoc32/release/winscw/udeb/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
+../data/101FB3E7.xml /epoc32/release/winscw/urel/z/private/10282BC4/Settings/10282C74/101FB3E7.xml
PRJ_TESTMMPFILES
sensordatacompensatorplgtest.mmp
--- a/layers.sysdef.xml Fri Sep 17 08:30:44 2010 +0300
+++ b/layers.sysdef.xml Mon Oct 04 00:28:21 2010 +0300
@@ -10,10 +10,28 @@
<unit unitID="sydo.appsupport" name="appsupport" bldFile="&layer_real_source_path;" mrp="" proFile="appsupport.pro"/>
</module>
<module name="">
- <unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build" />
+ <unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" />
<unit unitID="sydo.appsupport.appsupport_plat.flash_netscape_plugin_command_api" name="sydo_appsupport_appsupport_plat_flash_netscape_plugin_command_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_netscape_plugin_command_api/group" mrp="" filter="!sf_build" />
- <unit unitID="sydo.appsupport.coreapplicationuis.atcmdplugin" name="sydo_appsupport_appsupport_coreapplicationuis_atcmdplugin" bldFile="&layer_real_source_path;/coreapplicationuis/atcmdplugin/group" mrp="" filter="!oem_build" />
+ <unit unitID="sydo.appsupport.coreapplicationuis.atcmdplugin" name="sydo_appsupport_appsupport_coreapplicationuis_atcmdplugin" bldFile="&layer_real_source_path;/coreapplicationuis/atcmdplugin/group" mrp="" />
</module>
+ <module name="from_package_definition">
+ <unit unitID="appsupport.fileconverterfw" mrp="" bldFile="&layer_real_source_path;/filehandling/fileconverterfw/group" name="appsupport.fileconverterfw"/>
+ <unit unitID="appsupport.htmltorichtextconverter" mrp="" bldFile="&layer_real_source_path;/filehandling/htmltorichtextconverter/group" name="appsupport.htmltorichtextconverter"/>
+ <unit unitID="appsupport.richtesttohtmlconverter" mrp="" bldFile="&layer_real_source_path;/filehandling/richtexttohtmlconverter/Group" name="appsupport.richtesttohtmlconverter"/>
+ <unit unitID="appsupport.hwresourcemgruiplugin" mrp="" bldFile="&layer_real_source_path;/hwresourceadaptation/hwresourcemgruiplugin/group" name="appsupport.hwresourcemgruiplugin"/>
+ <unit unitID="appsupport.alarmserver" mrp="" bldFile="&layer_real_source_path;/commonappservices/alarmserver/Group" name="appsupport.alarmserver"/>
+ <unit unitID="appsupport.testalarmsrv" mrp="" bldFile="&layer_real_source_path;/commonappservices/alarmservertest/TestAlarmSrv" name="appsupport.testalarmsrv"/>
+ <unit unitID="appsupport.coreappstest" mrp="" bldFile="&layer_real_source_path;/commonappservices/coreappstest/Group" name="appsupport.coreappstest"/>
+ <unit unitID="appsupport.tzlocrscfactory" mrp="" bldFile="&layer_real_source_path;/tzservices/tzlocrscfactory/group" name="appsupport.tzlocrscfactory"/>
+ <unit unitID="appsupport.tzdatabase" mrp="" bldFile="&layer_real_source_path;/tzservices/tzdatabase/group" name="appsupport.tzdatabase"/>
+ <unit unitID="appsupport.webrecognizers" mrp="" bldFile="&layer_real_source_path;/contenthandling/webrecognisers/group" name="appsupport.webrecognizers"/>
+ <unit unitID="appsupport.commandshell" mrp="" bldFile="&layer_real_source_path;/openenvutils/commandshell/group" name="appsupport.commandshell"/>
+ <unit unitID="appsupport.telnetserver" mrp="" bldFile="&layer_real_source_path;/openenvutils/telnetserver/group" name="appsupport.telnetserver"/>
+ <unit unitID="appsupport.uitestfw" mrp="" bldFile="&layer_real_source_path;/appfw/uiftestfw/group" name="appsupport.uitestfw"/>
+ <unit unitID="appsupport.aftermarketappstarter" mrp="" bldFile="&layer_real_source_path;/applaunchservices/aftermarketappstarter/group" name="appsupport.aftermarketappstarter"/>
+ <unit unitID="appsupport.applaunchplugins" mrp="" bldFile="&layer_real_source_path;/applaunchservices/applaunchplugins/group" name="appsupport.applaunchplugins"/>
+ <unit unitID="appsupport.tzcompiler" mrp="" bldFile="&layer_real_source_path;/tzpcside/tzcompiler/group" name="appsupport.tzcompiler"/>
+ </module>
</layer>
</systemModel>
</SystemDefinition>
--- a/package_definition.xml Fri Sep 17 08:30:44 2010 +0300
+++ b/package_definition.xml Mon Oct 04 00:28:21 2010 +0300
@@ -1,154 +1,157 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
+ <meta rel="License">
+ <license type="EPL"><supplier>Nokia</supplier></license>
+ </meta>
<collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
- <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
+ <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_pub/flash_viewer_framework_api/flash_viewer_framework_api.metaxml"/>
<unit bldFile="appsupport_pub/flash_viewer_framework_api/group"/>
</component>
- <component id="network_status_api" name="Network Status API" class="api" filter="s60">
+ <component id="network_status_api" name="Network Status API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_pub/network_status_api/network_status_api.metaxml"/>
<unit bldFile="appsupport_pub/network_status_api/group"/>
</component>
</collection>
<collection id="appsupport_plat" name="Generic Application Support Platform Interfaces" level="specific">
- <component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60">
+ <component id="action_plugin_api" name="Action Plug-In API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/action_plugin_api/action_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/action_plugin_api/group"/>
</component>
- <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60">
+ <component id="application_orientation_api" name="Application Orientation API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/application_orientation_api/application_orientation_api.metaxml"/>
<unit bldFile="appsupport_plat/application_orientation_api/group"/>
</component>
- <component id="context_access_api" name="Context Access API" class="api" filter="s60">
+ <component id="context_access_api" name="Context Access API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_access_api/context_access_api.metaxml"/>
<unit bldFile="appsupport_plat/context_access_api/group"/>
</component>
- <component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60">
+ <component id="context_framework_services_api" name="Context Framework Services API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_framework_services_api/context_framework_services_api.metaxml"/>
<unit bldFile="appsupport_plat/context_framework_services_api/group"/>
</component>
- <component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60">
+ <component id="context_framework_client_api" name="Context Framework Client API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_framework_client_api/context_framework_client_api.metaxml"/>
<unit bldFile="appsupport_plat/context_framework_client_api/group"/>
</component>
- <component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60">
+ <component id="context_framework_listener_api" name="Context Framework Listener API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_framework_listener_api/context_framework_listener_api.metaxml"/>
<unit bldFile="appsupport_plat/context_framework_listener_api/group"/>
</component>
- <component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60">
+ <component id="context_framework_version_api" name="Context Framework Version API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_framework_version_api/context_framework_version_api.metaxml"/>
<unit bldFile="appsupport_plat/context_framework_version_api/group"/>
</component>
- <component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60">
+ <component id="context_source_plugin_api" name="Context Source Plug-In API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_source_plugin_api/context_source_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/context_source_plugin_api/group"/>
</component>
- <component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60">
+ <component id="context_source_settings_manager_api" name="Context Source Settings Manager API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_source_settings_manager_api/context_source_settings_manager_api.metaxml"/>
<unit bldFile="appsupport_plat/context_source_settings_manager_api/group"/>
</component>
- <component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60">
+ <component id="context_subscription_api" name="Context Subscription API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/context_subscription_api/context_subscription_api.metaxml"/>
<unit bldFile="appsupport_plat/context_subscription_api/group"/>
</component>
- <component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60">
+ <component id="key_event_framework_api" name="Key Event Framework API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/key_event_framework_api/key_event_framework_api.metaxml"/>
<unit bldFile="appsupport_plat/key_event_framework_api/group"/>
</component>
- <component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60">
+ <component id="key_event_framework_mapper_api" name="Key Event Framework Mapper API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/key_event_framework_mapper_api/key_event_framework_mapper_api.metaxml"/>
<unit bldFile="appsupport_plat/key_event_framework_mapper_api/group"/>
</component>
- <component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60">
+ <component id="media_keys_definition_api" name="Media Keys Definition API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/media_keys_definition_api/media_keys_definition_api.metaxml"/>
<unit bldFile="appsupport_plat/media_keys_definition_api/group"/>
</component>
- <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60">
+ <component id="ood_threshold_api" name="OOD Threshold API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/ood_threshold_api/ood_threshold_api.metaxml"/>
<unit bldFile="appsupport_plat/ood_threshold_api/group"/>
</component>
- <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60">
+ <component id="oom_monitor_api" name="OOM Monitor API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/oom_monitor_api/oom_monitor_api.metaxml"/>
<unit bldFile="appsupport_plat/oom_monitor_api/group"/>
</component>
- <component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60">
+ <component id="oom_monitor_plugin_api" name="OOM Monitor Plugin API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/oom_monitor_plugin_api/oom_monitor_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/oom_monitor_plugin_api/group"/>
</component>
- <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60">
+ <component id="operation_provider_api" name="Operation Provider API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/operation_provider_api/operation_provider_api.metaxml"/>
<unit bldFile="appsupport_plat/operation_provider_api/group"/>
</component>
- <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60">
+ <component id="phonecmdhandler_api" name="Phone Command Handler API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/phonecmdhandler_api/phonecmdhandler_api.metaxml"/>
<unit bldFile="appsupport_plat/phonecmdhandler_api/group"/>
</component>
- <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60">
+ <component id="restore_factory_settings_api" name="Restore Factory Settings API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/restore_factory_settings_api/restore_factory_settings_api.metaxml"/>
<unit bldFile="appsupport_plat/restore_factory_settings_api/group"/>
</component>
- <component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60">
+ <component id="restore_factory_settings_plugin_api" name="Restore Factory Settings Plug-in API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/restore_factory_settings_plugin_api/restore_factory_settings_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/restore_factory_settings_plugin_api/group"/>
</component>
- <component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60">
+ <component id="secondary_display_accfw_api" name="Secondary Display Accessory Framework API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/secondary_display_accfw_api/secondary_display_accfw_api.metaxml"/>
<unit bldFile="appsupport_plat/secondary_display_accfw_api/group"/>
</component>
- <component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60">
+ <component id="secondary_display_startup_api" name="Secondary Display Startup API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/secondary_display_startup_api/secondary_display_startup_api.metaxml"/>
<unit bldFile="appsupport_plat/secondary_display_startup_api/group"/>
</component>
- <component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60">
+ <component id="secondary_display_sysap_api" name="Secondary Display System Application API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/secondary_display_sysap_api/secondary_display_sysap_api.metaxml"/>
<unit bldFile="appsupport_plat/secondary_display_sysap_api/group"/>
</component>
- <component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60">
+ <component id="secondary_display_system_state_api" name="Secondary Display System State API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/secondary_display_system_state_api/secondary_display_system_state_api.metaxml"/>
<unit bldFile="appsupport_plat/secondary_display_system_state_api/group"/>
</component>
- <component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60">
+ <component id="sensor_user_setting_api" name="Sensor User Setting API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/sensor_user_setting_api/sensor_user_setting_api.metaxml"/>
<unit bldFile="appsupport_plat/sensor_user_setting_api/group"/>
</component>
- <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60">
+ <component id="startup_configuration_api" name="Startup Configuration API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/startup_configuration_api/startup_configuration_api.metaxml"/>
<unit bldFile="appsupport_plat/startup_configuration_api/group"/>
</component>
- <component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60">
+ <component id="system_application_key_handler_plugin_api" name="System Application Key Handler Plug-in API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/system_application_key_handler_plugin_api/system_application_key_handler_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/system_application_key_handler_plugin_api/group"/>
</component>
- <component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60">
+ <component id="system_application_light_control_plugin_api" name="System Application Light Control Plug-in API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/system_application_light_control_plugin_api/system_application_light_control_plugin_api.metaxml"/>
<unit bldFile="appsupport_plat/system_application_light_control_plugin_api/group"/>
</component>
- <component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60">
+ <component id="system_application_notification_api" name="System Application Notification API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/system_application_notification_api/system_application_notification_api.metaxml"/>
<unit bldFile="appsupport_plat/system_application_notification_api/group"/>
</component>
- <component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60">
+ <component id="system_application_plugin_callback_api" name="System Application Plug-in Callback API" class="api" filter="s60,build_as_app">
<meta rel="Api" href="appsupport_plat/system_application_plugin_callback_api/system_application_plugin_callback_api.metaxml"/>
<unit bldFile="appsupport_plat/system_application_plugin_callback_api/group"/>
</component>
- <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60" introduced="^2">
+ <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,build_as_app" introduced="^2">
<meta rel="Api" href="appsupport_plat/flash_mmi_service_interface_custom_api/flash_mmi_service_interface_custom_api.metaxml"/>
<unit bldFile="appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
</component>
- <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60" introduced="^2">
+ <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,build_as_app" introduced="^2">
<meta rel="Api" href="appsupport_plat/flash_netscape_plugin_command_api/flash_netscape_plugin_command_api.metaxml"/>
<unit bldFile="appsupport_plat/flash_netscape_plugin_command_api/group"/>
</component>
</collection>
<collection id="contextframework" name="Context Framework" level="framework">
- <component id="cfw" filter="s60" name="Context Framework">
+ <component id="cfw" filter="s60,build_as_app" name="Context Framework">
<meta rel="config">
<defined condition="RD_CONTEXT_FRAMEWORK"/>
</meta>
<unit bldFile="contextframework/cfw/group"/>
</component>
- <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
+ <component id="cfwplugins" filter="s60,build_as_app" name="Context Framework Plugins" class="plugin">
<meta rel="config">
<defined condition="RD_CONTEXT_FRAMEWORK"/>
</meta>
@@ -156,127 +159,127 @@
</component>
</collection>
<collection id="coreapplicationuis" name="Core Application UIs" level="server">
- <component id="dbrecovery" filter="s60" name="Database Recovery">
+ <component id="dbrecovery" filter="s60,build_as_app" name="Database Recovery">
<unit bldFile="coreapplicationuis/dbrecovery/group"/>
</component>
- <component id="nspswsplugin" filter="s60" name="NSPS WS Plugin" class="plugin">
+ <component id="nspswsplugin" filter="s60,build_as_app" name="NSPS WS Plugin" class="plugin">
<!-- No Service Power Save? Window Server? Please elaborate-->
<unit bldFile="coreapplicationuis/nspswsplugin/group"/>
</component>
- <component id="rfs" filter="s60" name="Restore Factory Settings">
+ <component id="rfs" filter="s60,build_as_app" name="Restore Factory Settings">
<unit bldFile="coreapplicationuis/rfs/group"/>
</component>
- <component id="rfsplugins" filter="s60" name="Restore Factory Settings Plugins" class="plugin">
+ <component id="rfsplugins" filter="s60,build_as_app" name="Restore Factory Settings Plugins" class="plugin">
<unit bldFile="coreapplicationuis/rfsplugins/group"/>
</component>
- <component id="cprfsplugin" name="Control Panel Restore Factory Settings" class="plugin" introduced="^4" filter="s60">
+ <component id="cprfsplugin" name="Control Panel Restore Factory Settings" class="plugin" introduced="^4" filter="s60,build_as_app">
<!-- can't have a component inside another component. Need to move to coreapplicationuis/cprfsplugin -->
<unit bldFile="coreapplicationuis/Rfs/Plugins/cprfsplugin" qt:proFile="cprfsplugin.pro"/>
</component>
- <component id="sysap" filter="s60" name="System Application">
+ <component id="sysap" filter="s60,build_as_app" name="System Application">
<unit bldFile="coreapplicationuis/sysap/group"/>
</component>
- <component id="variatedsettings" filter="s60" name="Variated Settings" class="config">
+ <component id="variatedsettings" filter="s60,build_as_app" name="Variated Settings" class="config">
<unit bldFile="coreapplicationuis/variatedsettings/group"/>
</component>
- <component id="accfwuinotifier" filter="s60" name="Accessory Framework UI Notifier" class="plugin">
+ <component id="accfwuinotifier" filter="s60,build_as_app" name="Accessory Framework UI Notifier" class="plugin">
<unit bldFile="coreapplicationuis/accfwuinotifier/group"/>
</component>
- <component id="kefmapper" filter="s60" name="Key Event Framework">
+ <component id="kefmapper" filter="s60,build_as_app" name="Key Event Framework">
<unit bldFile="coreapplicationuis/kefmapper/group"/>
</component>
- <component id="advancedtspcontroller" filter="s60" name="Advanced TSP Controller">
+ <component id="advancedtspcontroller" filter="s60,build_as_app" name="Advanced TSP Controller">
<unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
</component>
- <component id="powersaveutilities" filter="s60" name="Power Save Utilities">
+ <component id="powersaveutilities" filter="s60,build_as_app" name="Power Save Utilities">
<unit bldFile="coreapplicationuis/powersaveutilities" qt:proFile="powersaveutilities.pro"/>
</component>
- <component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
+ <component id="gsserverenginestub" filter="s60,build_as_app" name="GS Server Engine Stub" deprecated="^4">
<unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
</component>
- <component id="gsserverengine" filter="s60" name="GS Server Engine" deprecated="^4">
+ <component id="gsserverengine" filter="s60,build_as_app" name="GS Server Engine" deprecated="^4">
<unit bldFile="coreapplicationuis/gsserverengine/group"/>
</component>
- <component id="sensordatacompensatorplugin" filter="s60" name="Sensor Data Compensator Plugin" class="plugin">
+ <component id="sensordatacompensatorplugin" filter="s60,build_as_app" name="Sensor Data Compensator Plugin" class="plugin">
<unit bldFile="coreapplicationuis/sensordatacompensatorplugin/group"/>
</component>
- <component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
+ <component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,build_as_app">
<unit bldFile="coreapplicationuis/atcmdplugin/group"/>
</component>
- <component id="devicepowermenuplugin" name="Device Power Menu Plugin" class="plugin" introduced="^4" filter="s60">
+ <component id="devicepowermenuplugin" name="Device Power Menu Plugin" class="plugin" introduced="^4" filter="s60,build_as_app">
<unit bldFile="coreapplicationuis/devicepowermenuplugin" qt:proFile="devicepowermenuplugin.pro"/>
</component>
</collection>
<collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
<!-- collection is really a component. Move down a directory -->
- <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60" introduced="^2">
+ <component id="flashliteapi_3_1_build" name="Flash Lite API Build" filter="s60,build_as_app" introduced="^2">
<unit base="flashliteapi_3_1/group"/>
</component>
</collection>
<collection id="mediakeys" name="Media Keys" level="plugin">
<!-- collection is really a component. Move down a directory -->
- <component id="mediakeys_build" filter="s60" name="Media Keys Build">
+ <component id="mediakeys_build" filter="s60,build_as_app" name="Media Keys Build">
<unit bldFile="mediakeys/group"/>
</component>
</collection>
<collection id="startupservices" name="Startup Services" level="system">
- <component id="splashscreen" filter="s60" name="Splash Screen">
+ <component id="splashscreen" filter="s60,build_as_app" name="Splash Screen">
<unit bldFile="startupservices/splashscreen/group"/>
</component>
- <component id="startupanimation" filter="s60" name="Startup Animation">
+ <component id="startupanimation" filter="s60,build_as_app" name="Startup Animation">
<unit bldFile="startupservices/startupanimation/group"/>
</component>
- <component id="startup" name="Startup Application" filter="s60">
+ <component id="startup" name="Startup Application" filter="s60,build_as_app">
<unit bldFile="startupservices/startup/group"/>
</component>
</collection>
<collection id="sysresmonitoring" name="System Resource Monitoring" level="system">
- <component id="oodmonitor" filter="s60" name="OOD Monitor" introduced="7.0s">
+ <component id="oodmonitor" filter="s60,build_as_app" name="OOD Monitor" introduced="7.0s">
<unit bldFile="sysresmonitoring/oodmonitor/group"/>
</component>
- <component id="oommonitor" filter="s60" name="OOM Monitor" introduced="7.0s">
+ <component id="oommonitor" filter="s60,build_as_app" name="OOM Monitor" introduced="7.0s">
<unit bldFile="sysresmonitoring/oommonitor/group"/>
</component>
</collection>
<collection id="systemsettings" name="System Settings" level="system">
- <component id="gssensorplugin" filter="s60" name="GS Sensor Plugin" class="plugin">
+ <component id="gssensorplugin" filter="s60,build_as_app" name="GS Sensor Plugin" class="plugin">
<unit bldFile="systemsettings/gssensorplugin/group"/>
</component>
- <component id="gsaccessoryplugin" filter="s60,test" name="GS Accessory Plugin" class="plugin"> <!-- don't build -->
+ <component id="gsaccessoryplugin" filter="s60,build_as_app,test" name="GS Accessory Plugin" class="plugin"> <!-- don't build -->
<unit bldFile="systemsettings/gsaccessoryplugin/group"/>
</component>
- <component id="accindicatorplugin" filter="s60" name="ACC Indicator Plugin" class="plugin">
+ <component id="accindicatorplugin" filter="s60,build_as_app" name="ACC Indicator Plugin" class="plugin">
<unit bldFile="systemsettings/accindicatorplugin" qt:proFile="accindicatorplugin.pro"/>
</component>
- <component id="accindicatorsettings" filter="s60" name="ACC Indicator Settings">
+ <component id="accindicatorsettings" filter="s60,build_as_app" name="ACC Indicator Settings">
<!-- can't have a component inside another component -->
<unit bldFile="systemsettings/accindicatorplugin/accindicatorsettings" qt:proFile="accindicatorsettings.pro"/>
</component>
</collection>
<collection id="filehandling" name="File Handling" level="server">
- <component id="fileconverterfw" name="File Converter Framework" purpose="optional">
+ <component id="fileconverterfw" name="File Converter Framework" purpose="optional" filter="s60,build_as_app">
<unit bldFile="filehandling/fileconverterfw/group" mrp="filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
</component>
- <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin">
+ <component id="htmltorichtextconverter" name="HTML to RichText Converter" introduced="7.0" purpose="optional" class="plugin" filter="s60,build_as_app">
<unit bldFile="filehandling/htmltorichtextconverter/group" mrp="filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
</component>
- <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin">
+ <component id="richtexttohtmlconverter" name="RichText to HTML Converter" introduced="7.0s" purpose="optional" class="plugin" filter="s60,build_as_app">
<unit bldFile="filehandling/richtexttohtmlconverter/Group" mrp="filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
</component>
</collection>
<collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
- <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin">
+ <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" purpose="optional" class="plugin" filter="s60,build_as_app">
<unit bldFile="hwresourceadaptation/hwresourcemgruiplugin/group" mrp="hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
</component>
</collection>
<collection id="commonappservices" name="Common Application Services" level="framework">
- <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional">
+ <component id="alarmserver" name="Alarm Server" introduced="7.0" purpose="optional" filter="s60,build_as_app">
<unit bldFile="commonappservices/alarmserver/Group" mrp="commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
</component>
- <component id="alarmservertest" name="Alarm Server Test" introduced="8.1" purpose="development">
+ <component id="alarmservertest" name="Alarm Server Test" introduced="8.1" purpose="development" filter="s60,build_as_app">
<unit bldFile="commonappservices/alarmservertest/TestAlarmSrv" mrp="commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
</component>
- <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="test">
+ <component id="coreappstest" name="Core Apps Test" introduced="8.1" purpose="development" filter="s60,build_as_app,test">
<unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
</component>
<component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
@@ -293,23 +296,23 @@
<component id="tzloc" name="Time Zone Localization" introduced="9.1" purpose="optional">
<unit bldFile="tzservices/tzloc/group" mrp="tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
</component>
- <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config">
+ <component id="tzlocrscfactory" name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config" filter="s60,build_as_app">
<unit bldFile="tzservices/tzlocrscfactory/group" mrp="tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
</component>
- <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config">
+ <component id="tzdatabase" name="Time Zone Database" introduced="9.1" purpose="optional" class="config" filter="s60,build_as_app">
<unit bldFile="tzservices/tzdatabase/group" mrp="tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
</component>
</collection>
<collection id="contenthandling" name="Content Handling" level="plugin">
- <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin">
+ <component id="webrecognisers" name="Web Recognisers" purpose="optional" class="plugin" filter="s60,build_as_app">
<unit bldFile="contenthandling/webrecognisers/group" mrp="contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
</component>
</collection>
<collection id="openenvutils" name="Open Environment Utilities" level="specific">
- <component id="commandshell" name="Command Shell" introduced="^3" purpose="development">
+ <component id="commandshell" name="Command Shell" introduced="^3" purpose="development" filter="s60,build_as_app">
<unit bldFile="openenvutils/commandshell/group" mrp="openenvutils/commandshell/group/oetools_zsh.mrp"/>
</component>
- <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development">
+ <component id="telnetserver" name="Telnet Server" introduced="^3" purpose="development" filter="s60,build_as_app">
<unit bldFile="openenvutils/telnetserver/group" mrp="openenvutils/telnetserver/group/oetools_telnetd.mrp"/>
</component>
</collection>
@@ -325,20 +328,20 @@
<component id="viewserver" name="View Server" introduced="6.0" purpose="mandatory">
<unit bldFile="appfw/viewserver/group" mrp="appfw/viewserver/group/app-framework_viewsrv.mrp"/>
</component>
- <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="test">
+ <component id="uiftestfw" name="UIF Test Framework" introduced="9.2" purpose="development" filter="s60,build_as_app,test">
<unit mrp="appfw/uiftestfw/group/app-framework_testframework.mrp" bldFile="appfw/uiftestfw/group"/>
</component>
</collection>
<collection id="applaunchservices" name="Application Launch Services" level="generic">
- <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional">
+ <component id="aftermarketappstarter" name="After Market Application Starter" introduced="^3" purpose="optional" filter="s60,build_as_app">
<unit bldFile="applaunchservices/aftermarketappstarter/group" mrp="applaunchservices/aftermarketappstarter/group/app-framework_amastart.mrp"/>
</component>
- <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional">
+ <component id="applaunchplugins" name="Application Launch Plugins" introduced="^3" purpose="optional" filter="s60,build_as_app">
<unit bldFile="applaunchservices/applaunchplugins/group" mrp="applaunchservices/applaunchplugins/group/app-framework_aplp.mrp"/>
</component>
</collection>
<collection id="tzpcside" name="Time Zone PC Side" level="plugin">
- <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop">
+ <component id="tzcompiler" name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config" target="desktop" filter="s60,build_as_app">
<unit bldFile="tzpcside/tzcompiler/group" mrp="tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
</component>
</collection>
--- a/printingsupport/printinguisupport/group/BLD.INF Fri Sep 17 08:30:44 2010 +0300
+++ b/printingsupport/printinguisupport/group/BLD.INF Mon Oct 04 00:28:21 2010 +0300
@@ -39,7 +39,7 @@
../inc/prnpath.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(printinguisupport/prnpath.h)
../inc/PRNUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnuids.h)
-../group/print.iby /epoc32/rom/include/print.iby
+../group/print.iby CORE_MW_LAYER_IBY_EXPORT_PATH(print.iby)
PRJ_MMPFILES
// specify the .mmp files required for building the important component releasables
--- a/startupservices/SplashScreen/inc/SplashScreen.h Fri Sep 17 08:30:44 2010 +0300
+++ b/startupservices/SplashScreen/inc/SplashScreen.h Mon Oct 04 00:28:21 2010 +0300
@@ -155,7 +155,7 @@
CMainWindow (CWsClient* aClient);
~CMainWindow ();
void Draw (const TRect& aRect);
- CFbsBitmap* ReadSVGL (TFileName aFileName);
+ CFbsBitmap* ReadSVGL (const TFileName& aFileName);
void HandlePointerEvent (TPointerEvent& aPointerEvent);
void ConstructL (const TRect& aRect, CWindow* aParent=0);
private:
--- a/startupservices/SplashScreen/src/SplashScreen.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/startupservices/SplashScreen/src/SplashScreen.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -331,7 +331,7 @@
TRACES("CMainWindow::~CMainWindow(): End");
}
-CFbsBitmap* CMainWindow::ReadSVGL (TFileName aFileName)
+CFbsBitmap* CMainWindow::ReadSVGL (const TFileName& aFileName)
{
TRACES("CMainWindow::ReadSVGL(): Start");
TFontSpec fontspec;
--- a/sysresmonitoring/oommonitor/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -23,9 +23,9 @@
PRJ_EXPORTS
../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby)
-../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml
-../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml
-../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml
PRJ_MMPFILES
oommonitor.mmp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Fri Sep 17 08:30:44 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Mon Oct 04 00:28:21 2010 +0300
@@ -21,7 +21,7 @@
DEFAULT
PRJ_TESTEXPORTS
-../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
+../../data/oomconfig.xml /epoc32/data/z/private/10207218/oomconfig.xml
PRJ_TESTMMPFILES
--- a/systemsettings/accindicatorplugin/inc/accindicator.h Fri Sep 17 08:30:44 2010 +0300
+++ b/systemsettings/accindicatorplugin/inc/accindicator.h Mon Oct 04 00:28:21 2010 +0300
@@ -62,15 +62,11 @@
private:
QString mDisplayName;
- QProcess mProcess;
TAccMode mAccMode;
int mAccType;
QStringList mIndicatorTypes;
QStringList mArgs;
-private slots:
- void processError(QProcess::ProcessError err); // handler for error codes
-
private:
Q_DISABLE_COPY(AccIndicatorPlugin)
int mError;
--- a/systemsettings/accindicatorplugin/src/accindicator.cpp Fri Sep 17 08:30:44 2010 +0300
+++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Mon Oct 04 00:28:21 2010 +0300
@@ -96,8 +96,6 @@
// If it is 3-pole ( i.e., HeadSet or TTY ) and TV-Out enable the handleInteraction() to change the settings.
if(mAccMode == EAccModeWiredHeadset || mAccMode == EAccModeWirelessHeadset || mAccMode == EAccModeTextDevice || mAccMode == EAccModeTVOut )
{
- QObject::connect( &mProcess, SIGNAL(error(QProcess::ProcessError)),
- this, SLOT(processError(QProcess::ProcessError)));
QVariant mode,type;
mode.setValue((int)mAccMode);
@@ -106,7 +104,8 @@
mArgs.append(type.toString());
// Launch the process to show the view.
- mProcess.start("accindicatorsettings" , mArgs);
+ QString program("z://sys//bin//accindicatorsettings.exe");
+ QProcess::startDetached(program,mArgs);
handled = true;
}
}
@@ -128,7 +127,7 @@
return type;
}
//for displaying the icon in indicator.
- case MonoDecorationNameRole:
+ case DecorationNameRole:
{
QString iconName;
if(mAccType == KPCWired || mAccType == KPCUSB)
@@ -228,23 +227,3 @@
mDisplayName.append(QString("Unknown"));
}
}
-
-// ----------------------------------------------------------------------------
-// AccIndicator::processError
-// handle the error conditions reurned by the QProcess.
-// ----------------------------------------------------------------------------
-
-void AccIndicatorPlugin::processError(QProcess::ProcessError err)
- {
- switch (err) {
- case QProcess::FailedToStart:
- case QProcess::Crashed:
- case QProcess::Timedout:
- case QProcess::ReadError:
- case QProcess::WriteError:
- case QProcess::UnknownError:
- break;
- default:
- break;
- }
- }
--- a/tzservices/tzlocrscfactory/res/timezonegroups.rss Fri Sep 17 08:30:44 2010 +0300
+++ b/tzservices/tzlocrscfactory/res/timezonegroups.rss Mon Oct 04 00:28:21 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -82,4 +82,4 @@
{
city_group_id = 12;
city_group_name = STRING_city_group_name_12;
- }
\ No newline at end of file
+ }