# HG changeset patch # User William Roberts # Date 1275052297 -3600 # Node ID 2495cfdb1a0f056b54b722f96b5d0d9f061ab9b3 # Parent 332e7bf3b42f1cf9948dfae1fc92522a18477405# Parent afba831adaf6d3ac1f699355526a3a5c8c352c32 Re-merge Symbian Foundation splash screen changes diff -r 332e7bf3b42f -r 2495cfdb1a0f startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Tue May 25 12:52:36 2010 +0300 +++ b/startupservices/SplashScreen/group/bld.inf Fri May 28 14:11:37 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 332e7bf3b42f -r 2495cfdb1a0f 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 May 28 14:11:37 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + diff -r 332e7bf3b42f -r 2495cfdb1a0f startupservices/SplashScreen/src/SplashScreen.cpp