# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1263562636 0
# Node ID 7136693697edf9798821a3519b638fea72f243ff
# Parent  bc8e1b2568a4302721f938129e3f5cbf119322b5# Parent  acb06ca7ad4816b3cabba68c7793a006c2fb6546
catch up

diff -r bc8e1b2568a4 -r 7136693697ed sbsv2/raptor/test/smoke_suite/qt.py
--- a/sbsv2/raptor/test/smoke_suite/qt.py	Thu Jan 14 16:29:37 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/qt.py	Fri Jan 15 13:37:16 2010 +0000
@@ -21,33 +21,33 @@
 
 	t.description = "Ensure Raptor builds Qt applications successfully"	
 
-	t.id = "00xx"
-	t.name = "qt_apps"
+	t.id = "00xx"	# TO DO: update ID
+	t.name = "qt_helloworld"
 	t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs"
 	t.targets = [
 			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworld.loc",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworld.rss",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworld_reg.rss",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworld_template.pkg",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.rss",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_reg.rss",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_template.pkg",
 			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/Makefile",
-			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworld.exe",
-			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworld.exe.map",
-			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworld.exe",
-			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworld.exe.map",
-			"$(EPOCROOT)/epoc32/release/winscw/udeb/helloworld.exe",
-			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworld.exe",
-			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworld.exe.map"
+			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe.map",
+			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe.map",
+			"$(EPOCROOT)/epoc32/release/winscw/udeb/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe.map"
 		]
 	t.addbuildtargets('smoke_suite/test_resources/qt/bld.inf', [
-		"helloworld_exe/armv5/udeb/helloworld.o",
-		"helloworld_exe/armv5/udeb/helloworld.o.d",
-		"helloworld_exe/armv5/urel/helloworld.o",
-		"helloworld_exe/armv5/urel/helloworld.o.d",
-		"helloworld_exe/winscw/udeb/helloworld.o",
-		"helloworld_exe/winscw/udeb/helloworld.o.d",	
-		"helloworld_exe/winscw/urel/helloworld.o",
-		"helloworld_exe/winscw/urel/helloworld.o.d"
+		"helloworldqt_exe/armv5/udeb/helloworld.o",
+		"helloworldqt_exe/armv5/udeb/helloworld.o.d",
+		"helloworldqt_exe/armv5/urel/helloworld.o",
+		"helloworldqt_exe/armv5/urel/helloworld.o.d",
+		"helloworldqt_exe/winscw/udeb/helloworld.o",
+		"helloworldqt_exe/winscw/udeb/helloworld.o.d",	
+		"helloworldqt_exe/winscw/urel/helloworld.o",
+		"helloworldqt_exe/winscw/urel/helloworld.o.d"
 	])
 	t.run("windows")
 
diff -r bc8e1b2568a4 -r 7136693697ed sbsv2/raptor/test/smoke_suite/test_resources/qt/helloworld.pro
--- a/sbsv2/raptor/test/smoke_suite/test_resources/qt/helloworld.pro	Thu Jan 14 16:29:37 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += helloworld.cpp
diff -r bc8e1b2568a4 -r 7136693697ed sbsv2/raptor/test/smoke_suite/test_resources/qt/helloworldqt.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/qt/helloworldqt.pro	Fri Jan 15 13:37:16 2010 +0000
@@ -0,0 +1,8 @@
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+SOURCES += helloworld.cpp