diff -r b85b0c039c14 -r 1d94eb8df9c2 smf/smfservermodule/smfserver/Makefile
--- a/smf/smfservermodule/smfserver/Makefile	Fri May 21 15:40:57 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-# ==============================================================================
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue May 18 15:52:55 2010
-# This file is generated by qmake and should not be modified by the
-# user.
-#  Name        : Makefile
-#  Description : Wrapper Makefile for calling Symbian build tools
-#
-# ==============================================================================
-
-
-MAKEFILE          = Makefile
-QMAKE             = d:\Qt\4.6.1\bin\qmake
-DEL_FILE          = del
-DEL_DIR           = rmdir
-MOVE              = move
-XCOPY             = xcopy /d /f /h /r /y /i
-ABLD              = ABLD.BAT
-DEBUG_PLATFORMS   = winscw gcce armv5 armv6
-RELEASE_PLATFORMS = gcce armv5 armv6
-MAKE              = make
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=$(EPOCROOT)epoc32\data\z
-endif
-
-DEFINES	 = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DNO_OTHER_MODULES -DQT_SQL_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/QtSql" -I"D:/Qt/4.6.1/include/QtSql/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/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:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/pluginmgr" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/pluginmgr/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/server" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/server/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfplugins" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfplugins/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/transportmgr" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/transportmgr/tmp" -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"
-first: default
-default: debug-winscw
-all: debug release
-
-qmake:
-	$(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfserver.pro"
-
-bld.inf:
-	$(QMAKE)
-
-$(ABLD): bld.inf
-	bldmake bldfiles
-
-debug: $(ABLD)
-	$(ABLD) build winscw udeb
-	$(ABLD) build gcce udeb
-	$(ABLD) build armv5 udeb
-	$(ABLD) build armv6 udeb
-
-release: $(ABLD)
-	$(ABLD) build gcce urel
-	$(ABLD) build armv5 urel
-	$(ABLD) build armv6 urel
-
-debug-winscw: $(ABLD)
-	$(ABLD) build winscw udeb
-debug-gcce: $(ABLD)
-	$(ABLD) build gcce udeb
-debug-armv5: $(ABLD)
-	$(ABLD) build armv5 udeb
-debug-armv6: $(ABLD)
-	$(ABLD) build armv6 udeb
-release-gcce: $(ABLD)
-	$(ABLD) build gcce urel
-release-armv5: $(ABLD)
-	$(ABLD) build armv5 urel
-release-armv6: $(ABLD)
-	$(ABLD) build armv6 urel
-
-export: $(ABLD)
-	$(ABLD) export
-
-cleanexport: $(ABLD)
-	$(ABLD) cleanexport
-
-D:\Qt\4.6.1\bin\moc.exe:
-	(cd $(QTDIR)/src/tools/moc && $(MAKE))
-
-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_smfpluginmanager.cpp moc_smfpluginmanagerutil.cpp moc_smfserver.cpp moc_smftransportmanager.cpp moc_smftransportmanagerutil.cpp moc_smfserverqt_p.cpp
-compiler_moc_header_clean:
-	-$(DEL_FILE) moc_smfpluginmanager.cpp moc_smfpluginmanagerutil.cpp moc_smfserver.cpp moc_smftransportmanager.cpp moc_smftransportmanagerutil.cpp moc_smfserverqt_p.cpp 2> NUL
-moc_smfpluginmanager.cpp: smfserverglobal.h \
-		pluginmgr\smfpluginmanager.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN pluginmgr\smfpluginmanager.h -o moc_smfpluginmanager.cpp
-
-moc_smfpluginmanagerutil.cpp: smfserverglobal.h \
-		pluginmgr\smfpluginmanagerutil.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN pluginmgr\smfpluginmanagerutil.h -o moc_smfpluginmanagerutil.cpp
-
-moc_smfserver.cpp: server\smfserver.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN server\smfserver.h -o moc_smfserver.cpp
-
-moc_smftransportmanager.cpp: smfserverglobal.h \
-		transportmgr\smftransportmanager.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN transportmgr\smftransportmanager.h -o moc_smftransportmanager.cpp
-
-moc_smftransportmanagerutil.cpp: smfserverglobal.h \
-		transportmgr\smftransportmanagerutil.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN transportmgr\smftransportmanagerutil.h -o moc_smftransportmanagerutil.cpp
-
-moc_smfserverqt_p.cpp: server\smfserverqt_p.h \
-		d:\Qt\4.6.1\bin\moc.exe
-	D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN server\smfserverqt_p.h -o moc_smfserverqt_p.cpp
-
-compiler_rcc_make_all:
-compiler_rcc_clean:
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
-	-$(DEL_FILE) qmake_image_collection.cpp 2> NUL
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all:
-compiler_uic_clean:
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_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\QtSql\tmp" mkdir "D:\Qt\4.6.1\include\QtSql\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\smf\smfservermodule\smfserver\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\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:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp"
-	-@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp"
-	-@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp"
-	-@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\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\QtSql\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\QtSql\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\smf\smfservermodule\smfserver\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\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:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp"
-	-@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp"
-	-@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp"
-	-@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp"
-
-pre_targetdeps: \
-	generated_sources \
-	all_source_deps
-
-generated_sources: \
-	moc_smfpluginmanager.cpp \
-	moc_smfpluginmanagerutil.cpp \
-	moc_smfserver.cpp \
-	moc_smftransportmanager.cpp \
-	moc_smftransportmanagerutil.cpp \
-	moc_smfserverqt_p.cpp
-
-all_source_deps: \
-	pluginmgr\smfpluginmanager.h \
-	smfserverglobal.h \
-	pluginmgr\smfpluginmanagerutil.h \
-	server\smfserver.h \
-	server\smfserversymbian_p.h \
-	server\SmfServer.h \
-	server\smfserverqt_p.h \
-	transportmgr\smftransportmanager.h \
-	transportmgr\smftransportmanagerutil.h
-
-finalize:
-
-winscw_deployment:
-
-winscw_deployment_clean:
-
-sis: restore_build
-	$(if $(wildcard smfserver_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) smfserver_template.pkg $(QT_SIS_TARGET) $(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)
-
-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
-	@echo #  Name        : .make.cache >> .make.cache
-	@echo #  Part of     : smfserver >> .make.cache
-	@echo #  Description : This file is used to cache last build target for >> .make.cache
-	@echo #                make sis target. >> .make.cache
-	@echo #  Version     :  >> .make.cache
-	@echo # >> .make.cache
-	@echo # ============================================================================== >> .make.cache
-	@echo. >> .make.cache
-	@echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache
-
-dodistclean:
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_template.pkg" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_template.pkg"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile_0xE5027327.mk" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile_0xE5027327.mk"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_0xE5027327.mmp" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_0xE5027327.mmp"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_reg.rss" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_reg.rss"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.rss" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.rss"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.loc" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.loc"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\.make.cache" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\.make.cache"
-	-@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\bld.inf" $(DEL_FILE)  "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\bld.inf"
-
-distclean: clean dodistclean
-
-clean: $(ABLD)
-	-$(ABLD) reallyclean
-	-bldmake clean
-
-clean-debug: $(ABLD)
-	$(ABLD) reallyclean winscw udeb
-	$(ABLD) reallyclean gcce udeb
-	$(ABLD) reallyclean armv5 udeb
-	$(ABLD) reallyclean armv6 udeb
-
-clean-release: $(ABLD)
-	$(ABLD) reallyclean gcce urel
-	$(ABLD) reallyclean armv5 urel
-	$(ABLD) reallyclean armv6 urel
-
-clean-debug-winscw: $(ABLD)
-	$(ABLD) reallyclean winscw udeb
-clean-debug-gcce: $(ABLD)
-	$(ABLD) reallyclean gcce udeb
-clean-debug-armv5: $(ABLD)
-	$(ABLD) reallyclean armv5 udeb
-clean-debug-armv6: $(ABLD)
-	$(ABLD) reallyclean armv6 udeb
-clean-release-gcce: $(ABLD)
-	$(ABLD) reallyclean gcce urel
-clean-release-armv5: $(ABLD)
-	$(ABLD) reallyclean armv5 urel
-clean-release-armv6: $(ABLD)
-	$(ABLD) reallyclean armv6 urel
-
-run:
-	-call /S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/release/winscw/udeb/smfserver.exe $(QT_RUN_OPTIONS)
-runonphone: sis
-	runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis smfserver_$(QT_SIS_TARGET).sis smfserver.exe $(QT_RUN_OPTIONS)
-