# HG changeset patch # User andy simpson # Date 1284736486 -3600 # Node ID a2ddb8b15745be2edcedd528ea7aec307dfe255e # Parent 75184094ace1f10701160a4649b57a1671200ec2# Parent 9af619316cbfd8ee2f929020e99d07e607dee924 Merge re-apply fixes for Bug 2524, Bug 2414 (Symbian splashscreen and shutdown) diff -r 9af619316cbf -r a2ddb8b15745 coreapplicationuis/SysAp/Group/bld.inf --- a/coreapplicationuis/SysAp/Group/bld.inf Tue Sep 14 21:35:53 2010 +0300 +++ b/coreapplicationuis/SysAp/Group/bld.inf Fri Sep 17 16:14:46 2010 +0100 @@ -21,11 +21,17 @@ PRJ_PLATFORMS DEFAULT +#define USE_SF_SPLASH_SVG //comment this to use standard S60 splash icon + PRJ_EXTENSIONS START EXTENSION s60/mifconv OPTION TARGETFILE sysap.mif OPTION HEADERFILE sysap.mbg - OPTION SOURCES -c8 qgn_startup_screen +#ifdef USE_SF_SPLASH_SVG + // use the local file (also called qgn_startup_screen to keep the mbg file the same) + OPTION SOURCEDIR ../../../startupservices/SplashScreen/sfimage +#endif + OPTION SOURCES -c8 qgn_startup_screen END diff -r 9af619316cbf -r a2ddb8b15745 startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Tue Sep 14 21:35:53 2010 +0300 +++ b/startupservices/SplashScreen/group/bld.inf Fri Sep 17 16:14:46 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -18,6 +18,7 @@ #include +#define USE_SF_SPLASH_SVG //comment this to use standard S60 splash icon PRJ_PLATFORMS DEFAULT @@ -32,5 +33,9 @@ START EXTENSION s60/mifconv OPTION TARGETFILE splashscreen.mif OPTION HEADERFILE splashscreen.mbg +#ifdef USE_SF_SPLASH_SVG + // use the local file (also called qgn_startup_screen to keep the mbg file the same) + OPTION SOURCEDIR ../sfimage +#endif OPTION SOURCES -c8 qgn_startup_screen END diff -r 9af619316cbf -r a2ddb8b15745 startupservices/SplashScreen/sfimage/qgn_startup_screen.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/startupservices/SplashScreen/sfimage/qgn_startup_screen.svg Fri Sep 17 16:14:46 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + diff -r 9af619316cbf -r a2ddb8b15745 startupservices/SplashScreen/src/SplashScreen.cpp diff -r 9af619316cbf -r a2ddb8b15745 tzpcside/tzcompiler/group/BLD.INF