diff -r b5d63d5fc252 -r a469c0e6e7fb example/smfclientapp/Makefile
--- a/example/smfclientapp/Makefile	Mon Jun 07 11:43:45 2010 +0100
+++ b/example/smfclientapp/Makefile	Wed Jun 23 19:51:49 2010 +0530
@@ -1,5 +1,5 @@
 # ==============================================================================
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue May 18 15:54:38 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Tue Jun 22 14:45:30 2010
 # This file is generated by qmake and should not be modified by the
 # user.
 #  Name        : Makefile
@@ -9,10 +9,12 @@
 
 
 MAKEFILE          = Makefile
-QMAKE             = d:\Qt\4.6.1\bin\qmake
+QMAKE             = f:\Qt\4.6.3\bin\qmake
 DEL_FILE          = del
 DEL_DIR           = rmdir
 MOVE              = move
+CHK_DIR_EXISTS    = if not exist
+MKDIR             = mkdir
 XCOPY             = xcopy /d /f /h /r /y /i
 ABLD              = ABLD.BAT
 DEBUG_PLATFORMS   = winscw gcce armv5 armv6
@@ -26,13 +28,13 @@
 endif
 
 DEFINES	 = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DWRITE_LOG -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
-INCPATH	 =  -I"D:/Qt/4.6.1/include/QtCore" -I"D:/Qt/4.6.1/include/QtCore/tmp" -I"D:/Qt/4.6.1/include/QtNetwork" -I"D:/Qt/4.6.1/include/QtNetwork/tmp" -I"D:/Qt/4.6.1/include/QtGui" -I"D:/Qt/4.6.1/include/QtGui/tmp" -I"D:/Qt/4.6.1/include/QtWebKit" -I"D:/Qt/4.6.1/include/QtWebKit/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/example/smfclientapp" -I"D:/CarbideWorkspace/smfserver_cleaned/example/smfclientapp/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware/loc" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/stlport" -I"D:/Qt/4.6.1/include/QtXmlPatterns" -I"D:/Qt/4.6.1/include/QtXmlPatterns/tmp"
+INCPATH	 =  -I"F:/Qt/4.6.3/include/QtCore" -I"F:/Qt/4.6.3/include/QtCore/tmp" -I"F:/Qt/4.6.3/include/QtNetwork" -I"F:/Qt/4.6.3/include/QtNetwork/tmp" -I"F:/Qt/4.6.3/include/QtGui" -I"F:/Qt/4.6.3/include/QtGui/tmp" -I"F:/Qt/4.6.3/include/QtWebKit" -I"F:/Qt/4.6.3/include/QtWebKit/tmp" -I"F:/Qt/4.6.3/include" -I"F:/Qt/4.6.3/include/tmp" -I"F:/Qt/4.6.3/include/QtContacts" -I"F:/Qt/4.6.3/include/QtContacts/tmp" -I"F:/Qt/4.6.3/include/QtLocation" -I"F:/Qt/4.6.3/include/QtLocation/tmp" -I"F:/Qt/4.6.3/mkspecs/common/symbian" -I"F:/Qt/4.6.3/mkspecs/common/symbian/tmp" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis/sys" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/mw" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/app" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/app" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/loc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw/loc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/app/loc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/loc/sc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/mw/loc/sc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/platform/app/loc/sc" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/include/stdapis/stlportv5" -I"F:/Qt/4.6.3/include/QtXmlPatterns" -I"F:/Qt/4.6.3/include/QtXmlPatterns/tmp" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/SMFCode/smf_baseline_22june_latest/example/smfclientapp" -I"F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/SMFCode/smf_baseline_22june_latest/example/smfclientapp/tmp"
 first: default
 default: debug-winscw
 all: debug release
 
 qmake:
-	$(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/smfserver_cleaned/example/smfclientapp/smfclientapp.pro"
+	$(QMAKE) -spec symbian-abld -o "bld.inf" "F:/Nokia/devices/Nokia_Symbian3_SDK_v0.8/SMFCode/smf_baseline_22june_latest/example/smfclientapp/smfclientapp.pro"
 
 bld.inf:
 	$(QMAKE)
@@ -72,30 +74,30 @@
 cleanexport: $(ABLD)
 	$(ABLD) cleanexport
 
-D:\Qt\4.6.1\bin\moc.exe:
-	(cd $(QTDIR)/src/tools/moc && $(MAKE))
+check: first
 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_displaywidget.cpp moc_testscreen.cpp moc_smfclientapp.cpp
+compiler_moc_header_make_all: moc_posttestui.cpp moc_displaywidget.cpp moc_testscreen.cpp moc_smfclientapp.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_displaywidget.cpp moc_testscreen.cpp moc_smfclientapp.cpp 2> NUL
+	-$(DEL_FILE) moc_posttestui.cpp moc_displaywidget.cpp moc_testscreen.cpp moc_smfclientapp.cpp 2> NUL
+moc_posttestui.cpp: ui_posttestui.h \
+		posttestui.h
+	F:\Qt\4.6.3\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN posttestui.h -o moc_posttestui.cpp
+
 moc_displaywidget.cpp: ui_displaywidget.h \
-		displaywidget.h \
-		..\..\..\..\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN displaywidget.h -o moc_displaywidget.cpp
+		displaywidget.h
+	F:\Qt\4.6.3\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN displaywidget.h -o moc_displaywidget.cpp
 
 moc_testscreen.cpp: ui_SmfClientApp.h \
-		testscreen.h \
-		..\..\..\..\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN testscreen.h -o moc_testscreen.cpp
+		testscreen.h
+	F:\Qt\4.6.3\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN testscreen.h -o moc_testscreen.cpp
 
 moc_smfclientapp.cpp: ui_SmfClientApp.h \
-		smfclientapp.h \
-		..\..\..\..\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN smfclientapp.h -o moc_smfclientapp.cpp
+		smfclientapp.h
+	F:\Qt\4.6.3\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN smfclientapp.h -o moc_smfclientapp.cpp
 
 compiler_rcc_make_all:
 compiler_rcc_clean:
@@ -104,14 +106,17 @@
 	-$(DEL_FILE) qmake_image_collection.cpp 2> NUL
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
-compiler_uic_make_all: ui_displaywidget.h ui_smfclientapp.h
+compiler_uic_make_all: ui_posttestui.h ui_displaywidget.h ui_smfclientapp.h
 compiler_uic_clean:
-	-$(DEL_FILE) ui_displaywidget.h ui_smfclientapp.h 2> NUL
+	-$(DEL_FILE) ui_posttestui.h ui_displaywidget.h ui_smfclientapp.h 2> NUL
+ui_posttestui.h: posttestui.ui
+	f:\Qt\4.6.3\bin\uic.exe posttestui.ui -o ui_posttestui.h
+
 ui_displaywidget.h: displaywidget.ui
-	d:\Qt\4.6.1\bin\uic.exe displaywidget.ui -o ui_displaywidget.h
+	f:\Qt\4.6.3\bin\uic.exe displaywidget.ui -o ui_displaywidget.h
 
 ui_smfclientapp.h: smfclientapp.ui
-	d:\Qt\4.6.1\bin\uic.exe smfclientapp.ui -o ui_smfclientapp.h
+	f:\Qt\4.6.3\bin\uic.exe smfclientapp.ui -o ui_smfclientapp.h
 
 compiler_yacc_decl_make_all:
 compiler_yacc_decl_clean:
@@ -122,37 +127,45 @@
 compiler_clean: compiler_moc_header_clean compiler_uic_clean 
 
 create_temps:
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\QtCore\tmp" mkdir "D:\Qt\4.6.1\include\QtCore\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" mkdir "D:\Qt\4.6.1\include\QtNetwork\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\QtGui\tmp" mkdir "D:\Qt\4.6.1\include\QtGui\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\QtWebKit\tmp" mkdir "D:\Qt\4.6.1\include\QtWebKit\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp"
-	-@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\QtXmlPatterns\tmp" mkdir "D:\Qt\4.6.1\include\QtXmlPatterns\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtCore\tmp" mkdir "F:\Qt\4.6.3\include\QtCore\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtNetwork\tmp" mkdir "F:\Qt\4.6.3\include\QtNetwork\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtGui\tmp" mkdir "F:\Qt\4.6.3\include\QtGui\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtWebKit\tmp" mkdir "F:\Qt\4.6.3\include\QtWebKit\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\tmp" mkdir "F:\Qt\4.6.3\include\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtContacts\tmp" mkdir "F:\Qt\4.6.3\include\QtContacts\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtLocation\tmp" mkdir "F:\Qt\4.6.3\include\QtLocation\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\mkspecs\common\symbian\tmp" mkdir "F:\Qt\4.6.3\mkspecs\common\symbian\tmp"
+	-@ if NOT EXIST "F:\Qt\4.6.3\include\QtXmlPatterns\tmp" mkdir "F:\Qt\4.6.3\include\QtXmlPatterns\tmp"
+	-@ if NOT EXIST "F:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\tmp" mkdir "F:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\tmp"
 
 extension_clean: compiler_clean
-	-@ if EXIST "D:\Qt\4.6.1\include\QtCore\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtCore\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtNetwork\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\QtGui\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtGui\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\QtWebKit\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtWebKit\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\tmp"
-	-@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\mkspecs\common\symbian\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\QtXmlPatterns\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtXmlPatterns\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtCore\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtCore\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtNetwork\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtNetwork\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtGui\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtGui\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtWebKit\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtWebKit\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtContacts\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtContacts\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtLocation\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtLocation\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\mkspecs\common\symbian\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\mkspecs\common\symbian\tmp"
+	-@ if EXIST "F:\Qt\4.6.3\include\QtXmlPatterns\tmp" rmdir  /S /Q  "F:\Qt\4.6.3\include\QtXmlPatterns\tmp"
+	-@ if EXIST "F:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\tmp" rmdir  /S /Q  "F:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\tmp"
 
 pre_targetdeps: \
 	generated_sources \
 	all_source_deps \
+	ui_posttestui.h \
 	ui_displaywidget.h \
 	ui_smfclientapp.h
 
 generated_sources: \
+	moc_posttestui.cpp \
 	moc_displaywidget.cpp \
 	moc_testscreen.cpp \
 	moc_smfclientapp.cpp
 
 all_source_deps: \
+	posttestui.h \
+	ui_posttestui.h \
 	displaywidget.h \
 	ui_displaywidget.h \
 	testscreen.h \
@@ -165,21 +178,39 @@
 
 winscw_deployment_clean:
 
-sis: restore_build
+deployment:
+
+deployment_clean:
+
+-include .make.cache
+
+sis:
 	$(if $(wildcard smfclientapp_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg)
 
 ok_sis:
 	createpackage.bat $(QT_SIS_OPTIONS) smfclientapp_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
+smfclientapp.sis:
+	$(MAKE) -s -f $(MAKEFILE) sis
+
+stub_sis:
+	$(if $(wildcard smfclientapp_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_stub_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_stub_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg)
+
+ok_stub_sis:
+	createpackage.bat -s $(QT_SIS_OPTIONS) smfclientapp_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+
+installer_sis: smfclientapp.sis
+	$(if $(wildcard smfclientapp_installer.pkg),$(MAKE) -s -f $(MAKEFILE) ok_installer_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg)
+
+ok_installer_sis: 
+	createpackage.bat $(QT_SIS_OPTIONS) smfclientapp_installer.pkg - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+
 fail_sis_nopkg:
-	$(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement)
+	$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)
 
 fail_sis_nocache:
 	$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)
 
-restore_build:
--include .make.cache
-
 store_build:
 	@echo # ============================================================================== > .make.cache
 	@echo # This file is generated by make and should not be modified by the user >> .make.cache
@@ -194,15 +225,16 @@
 	@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache
 
 dodistclean:
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_template.pkg" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_template.pkg"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\Makefile" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\Makefile"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\Makefile_0xE08059D4.mk" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\Makefile_0xE08059D4.mk"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_0xE08059D4.mmp" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_0xE08059D4.mmp"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_reg.rss" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp_reg.rss"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp.rss" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp.rss"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp.loc" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\smfclientapp.loc"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\.make.cache" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\.make.cache"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\bld.inf" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\example\smfclientapp\bld.inf"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_template.pkg" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_template.pkg"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_installer.pkg" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_installer.pkg"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\Makefile" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\Makefile"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\Makefile_0xE08059D6.mk" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\Makefile_0xE08059D6.mk"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_0xE08059D6.mmp" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_0xE08059D6.mmp"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_reg.rss" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp_reg.rss"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp.rss" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp.rss"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp.loc" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\smfclientapp.loc"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\.make.cache" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\.make.cache"
+	-@ if EXIST "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\bld.inf" $(DEL_FILE)  "f:\Nokia\devices\Nokia_Symbian3_SDK_v0.8\SMFCode\smf_baseline_22june_latest\example\smfclientapp\bld.inf"
 
 distclean: clean dodistclean
 
@@ -237,7 +269,7 @@
 	$(ABLD) reallyclean armv6 urel
 
 run:
-	-call /S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/release/winscw/udeb/smfclientapp.exe $(QT_RUN_OPTIONS)
+	-call /Nokia/devices/Nokia_Symbian3_SDK_v0.8/epoc32/release/winscw/udeb/smfclientapp.exe $(QT_RUN_OPTIONS)
 runonphone: sis
-	runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis smfclientapp_$(QT_SIS_TARGET).sis smfclientapp.exe $(QT_RUN_OPTIONS)
+	runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis smfclientapp.sis smfclientapp.exe $(QT_RUN_OPTIONS)