diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/qjson/tests/Makefile
--- a/smf/smfservermodule/util/qjson/tests/Makefile	Tue May 18 17:37:12 2010 +0530
+++ b/smf/smfservermodule/util/qjson/tests/Makefile	Fri May 21 15:45:10 2010 +0100
@@ -1,178 +1,135 @@
-# ==============================================================================
-# Generated by qmake (2.01a) (Qt 4.6.1) on: Mon May 17 12:46:26 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 for building: tests
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed May 19 14:07:21 2010
+# Project:  tests.pro
+# Template: app
+# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = 
+CFLAGS        = -pipe $(DEFINES)
+CXXFLAGS      = -pipe $(DEFINES)
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I.
+LINK          = g++
+LFLAGS        = 
+LIBS          = $(SUBLIBS)    
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /usr/bin/qmake-qt4
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       =  
+OBJECTS       = 
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf \
+		tests.pro
+QMAKE_TARGET  = tests
+DESTDIR       = 
+TARGET        = tests
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: tests.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf
+	$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+qmake:  FORCE
+	@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro
+
+dist: 
+	@$(CHK_DIR_EXISTS) .tmp/tests1.0.0 || $(MKDIR) .tmp/tests1.0.0 
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tests1.0.0/ && (cd `dirname .tmp/tests1.0.0` && $(TAR) tests1.0.0.tar tests1.0.0 && $(COMPRESS) tests1.0.0.tar) && $(MOVE) `dirname .tmp/tests1.0.0`/tests1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tests1.0.0
 
 
-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
+clean:compiler_clean 
+	-$(DEL_FILE) *~ core *.core
 
-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
-INCPATH	 =  -I"D:/Qt/4.6.1/mkspecs/common/symbian/stl-off" -I"D:/Qt/4.6.1/mkspecs/common/symbian/stl-off/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:/CarbideWorkspace/TestQJson/qjson/src" -I"D:/CarbideWorkspace/TestQJson/qjson/src/tmp" -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:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp"
-first: default
-default: debug-winscw
-all: debug release
-
-qmake:
-	$(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/TestQJson/qjson/tests/tests.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
+####### Sub-libraries
 
-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
+distclean: clean
+	-$(DEL_FILE) $(TARGET) 
+	-$(DEL_FILE) Makefile
 
-export: $(ABLD)
-	$(ABLD) export
-
-cleanexport: $(ABLD)
-	$(ABLD) cleanexport
 
 compiler_clean: 
 
-create_temps:
-	-@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\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\TestQJson\qjson\src\tmp" mkdir "D:\CarbideWorkspace\TestQJson\qjson\src\tmp"
-	-@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp"
-
-extension_clean: compiler_clean
-	-@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\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\TestQJson\qjson\src\tmp" rmdir  /S /Q  "D:\CarbideWorkspace\TestQJson\qjson\src\tmp"
-	-@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir  /S /Q  "D:\Qt\4.6.1\include\tmp"
-
-pre_targetdeps: \
-	generated_sources \
-	all_source_deps
-
-generated_sources:
-
-all_source_deps:
+####### Compile
 
-finalize:
-
-winscw_deployment:
-
-winscw_deployment_clean:
-
-sis: restore_build
-	$(if $(wildcard tests_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) tests_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
+####### Install
 
-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     : tests >> .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\TestQJson\qjson\tests\tests_template.pkg" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_template.pkg"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile_0xEdfa80af.mk" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile_0xEdfa80af.mk"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_0xEdfa80af.mmp" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_0xEdfa80af.mmp"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_reg.rss" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_reg.rss"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.rss" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.rss"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.loc" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.loc"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\.make.cache" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\.make.cache"
-	-@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\bld.inf" $(DEL_FILE)  "d:\CarbideWorkspace\TestQJson\qjson\tests\bld.inf"
-
-distclean: clean dodistclean
-
-clean: $(ABLD)
-	-$(ABLD) reallyclean
-	-bldmake clean
+install:   FORCE
 
-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
+uninstall:   FORCE
 
-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
+FORCE:
 
-run:
-	-call /S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/release/winscw/udeb/tests.exe $(QT_RUN_OPTIONS)
-runonphone: sis
-	runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis tests_$(QT_SIS_TARGET).sis tests.exe $(QT_RUN_OPTIONS)
-