# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1271795793 18000
# Node ID 323d745d1d2e28f6c8f6c182df2c8e5f6cc5ffd5
# Parent  0e45b6356eac45a899d7f3bfff34dfafd53a74f1# Parent  75aabc8b4b413494516e0b63aa9d76590d54a1f8
Merge commit

diff -r 0e45b6356eac -r 323d745d1d2e uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/bld.inf
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,11 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
-PRJ_EXPORTS
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_$(uid3).mif
+	OPTION HEADERFILE $(baseName$lower)_$(uid3).mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
 
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
+PRJ_MMPFILES
 $(baseName).mmp
diff -r 0e45b6356eac -r 323d745d1d2e uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/bld.inf
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,9 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_aif.mif
+	OPTION HEADERFILE $(baseName$lower)_aif.mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
+
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
-$(baseName).mmp
+PRJ_MMPFILES
+$(baseName).mmp
\ No newline at end of file
diff -r 0e45b6356eac -r 323d745d1d2e uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/bld.inf
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,9 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_aif.mif
+	OPTION HEADERFILE $(baseName$lower)_aif.mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
+
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
+PRJ_MMPFILES
 $(baseName).mmp