# HG changeset patch # User William Roberts # Date 1272487295 -3600 # Node ID 7d5dd0262126bb569e354a066d9e802e363feff7 # Parent a72ff4214918ac8cf453c8cbc730a3c7d302c031# Parent c82a39b81a38398e9726dfa99adb4941b8f37bc3 Remerge Symbian Foundation splashscreen changes diff -r a72ff4214918 -r 7d5dd0262126 startupservices/SplashScreen/group/bld.inf --- a/startupservices/SplashScreen/group/bld.inf Tue Apr 27 16:49:15 2010 +0300 +++ b/startupservices/SplashScreen/group/bld.inf Wed Apr 28 21:41:35 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 a72ff4214918 -r 7d5dd0262126 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 Wed Apr 28 21:41:35 2010 +0100 @@ -0,0 +1,10 @@ + + +]> + + diff -r a72ff4214918 -r 7d5dd0262126 startupservices/SplashScreen/src/SplashScreen.cpp