--- a/messagingapp/msgutils/unidatautils/unidatamodel/unidatamodel.pro	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgutils/unidatautils/unidatamodel/unidatamodel.pro	Fri Jun 25 15:47:40 2010 +0530
@@ -32,7 +32,6 @@
 INCLUDEPATH += inc
 INCLUDEPATH += ../../../../inc
 INCLUDEPATH += /s60/app/messaging/inc
-INCLUDEPATH += ../s60qconversions/inc
 INCLUDEPATH += ../../unieditorutils/editorgenutils/inc
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
@@ -53,6 +52,15 @@
 MMP_RULES += "TARGETPATH resource"
 MMP_RULES += "RESOURCE UniDataModel.rss"
 
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/unidatamodel.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/unidatamodel.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock
+
 SOURCES += inc/UniDataUtils.inl \
     src/UniDataUtils.cpp \
     inc/UniDataModel.inl \
@@ -116,7 +124,6 @@
     -lcaf \
     -lDrmServerInterfaces \
     -lmsgcommonutils \
-    -ls60qconversions \
     -lQtCore \
     -leditorgenutils