--- a/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/tsrc/testunidatamodelvcalplugin/testunidatamodelvcalplugin.pro	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/msgutils/unidatautils/unidatamodelplugins/unibiomessagedataplugin/tsrc/testunidatamodelvcalplugin/testunidatamodelvcalplugin.pro	Wed Aug 18 09:45:25 2010 +0300
@@ -17,23 +17,28 @@
 QT += testlib
 QT -= gui
 
-TEMPLATE = lib
-TARGET = test-unidatamodel-vcal-plugin
+TEMPLATE = app
+TARGET = testunidatamodelvcalplugin
 
+CONFIG += hb
+CONFIG += symbian_test
+CONFIG += qtestlib
 
 INCLUDEPATH += .
 INCLUDEPATH += ../../../../../../inc
+INCLUDEPATH += ../../../../../../../inc
+INCLUDEPATH += ../../../../../../../../../../epoc32/include/platform/mw
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 DEFINES += BUILD_TEST_DLL
 
 SOURCES += \
-	testunidatamodelvcalplugin.cpp
+	src/testunidatamodelvcalplugin.cpp
 
 				
 # Input
 HEADERS += \
-	testunidatamodelvcalplugin.h
+	inc/testunidatamodelvcalplugin.h
 	
 	   	   			 
    
@@ -45,16 +50,45 @@
     TARGET.EPOCALLOWDLLDATA = 1
     BLD_INF_RULES.prj_exports += "vcal1.txt /epoc32/winscw/c/test/vcal1.txt"
     BLD_INF_RULES.prj_exports += "BioMtm.rsc /epoc32/winscw/c/resource/messaging/mtm/BioMtm.rsc"
-		}
+    BLD_INF_RULES.prj_exports += "data/TestUniDataModelVCalPlugin.cfg c:/TestUniDataModelVCalPlugin.cfg"
+    BLD_INF_RULES.prj_exports += "data/TestUniDataModelVCalPlugin.pl c:/TestUniDataModelVCalPlugin.pl"
+    		}
+
+
+packageheader = "$${LITERAL_HASH}{\"testunidatamodelvcalplugin\"},(0xE2815e10),1,0,0,TYPE=SA"
 
-defBlock = \      
-	  "$${LITERAL_HASH}if defined(EABI)" \
-	  "DEFFILE  ../eabi/test_unidatamodel_vcal_plugin.def" \
-             "$${LITERAL_HASH}else" \
-             "DEFFILE  ../bwins/test_unidatamodel_vcal_plugin.def" \
-             "$${LITERAL_HASH}endif"
-	
-MMP_RULES += defBlock
+vendorinfo = \
+			"; Localised Vendor name" \
+			"%{\"Nokia\"}" \
+			"; Unique Vendor name" \
+			":\"Nokia\"" 
+			
+dependencyinfo = \
+				"; Default HW/platform dependencies" \
+				"[0x101F7961],0,0,0,{\"S60ProductID\"}" \
+				"[0x2001E61C],4,6,3,{"Qt"}
+				
+default_deployment.pkg_prerules =	packageheader \
+									vendorinfo \
+									dependencyinfo 
+
+
+#Copy the dependent DLL
+symbian: {
+	addCfg.sources = ./data/TestUniDataModelVCalPlugin.cfg
+	addCfg.path = C:/
+	DEPLOYMENT += addCfg
+
+	addPl.sources = ./data/TestUniDataModelVCalPlugin.pl
+	addPl.path = C:/
+	DEPLOYMENT += addPl
+
+	addP2.sources = ./vcal1.txt
+	addP2.path = C:/test
+	DEPLOYMENT += addP2
+
+	}
+
 
  LIBS += -leuser \
 	-lconvergedmessageutils\
@@ -68,7 +102,7 @@
 	-lbioc \
 	-lefsrv \
 	-lbiodb \
-	-lbifu \
-	-lxqutils
+     -lxqutils \
+	-lbifu